diff options
Diffstat (limited to 'dev-libs')
51 files changed, 226 insertions, 1480 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 7932a779b319..05102a2ea2e4 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 091926d1a5dc..88a7a8299543 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -3,27 +3,22 @@ AUX botan-2.19.5-cloudflare.patch 3012 BLAKE2B 066cd7a5d1e384ebd0596e2af0f00f98c AUX botan-2.19.5-no-distutils.patch 2597 BLAKE2B 5d2cf7e89939abdbf97cb01f6364809782c504c22a613b0fb0fdd112beda35b7f824fb9756a5782b55de775926c4447f3cbf5cc2803844acdd115e6ac1db8cce SHA512 171400cffbefb1d6a50bd0cd134083c6e63efd439a9f0129152637dcc4d3ec00d06494e6d8d3a526a71198a2f3e3a87951e23bcf8f647b3e9e7e3e59c9370c98 AUX botan-3.2.0-ninja.patch 575 BLAKE2B f75eb0a16fadfae6e0a1bb554262d8d902152c054fd97c19a1c4eda31a780138efd42ce05992896d16d98415c555a7cfa01b6dfa201c7e97ad971deab851e7b7 SHA512 ff9078ae1a43404680cf757da15bd17541f51f8de02a1a8d02f075676a1e35ff9a78adba0f3b84847634bc4904ed7b5824df6c708785865a4d01d4f9139e617b AUX botan-3.6.1-boost-1.87.patch 14585 BLAKE2B 175d0a7e0bd16fb1e8f1d2493ad41e6633ec32284704cfb182892acf35695adb38f142ebf557697a422b40b11a0b7842f9852b45022168ffa691ddd84f8334a3 SHA512 f4adea3772b7bff4304c3189f3be38c75c2a3ddcfeb451f7578e2f0e1487e2d1eedef0c7dd782a699cf966931a7ab32f0ca4079d9145b7c43495a6281bf68bea +AUX botan-3.6.1-no-avx2.patch 725 BLAKE2B c6f745d414259a9b4303985c99bb70a87d5d96c24deeba543803219d3ab5cf91f890da9547a79ffba7db11d2ef5f4e77e6c1cad0ed2df6c6241702b6ff3f4c93 SHA512 2b16cb0b21b2240124a1dc3759a5d9dc3597f78a1ba36124c27279aa38c38f5806fba01cbfa0b575bf6d270f3263964a634b7e86b70933233d78ad3773e84014 AUX botan-3.6.1-tests-glibcxx_assertions.patch 1989 BLAKE2B 21ecc6ac95f228c648da3b14927392378691078a67a2aeebaac18895646c03d531bf98342f6a10d40ae5eefbe5e65b565cb62ea860f70a8875673a21164d36d5 SHA512 41a8fcb9a7c865aceb70393f0ccbf5ac8bd7387cd6ec99e4806dbe02a6b90ddb016914bc6f14a5ae742c4989bfd68a0e28ec36b06cc1cb065a27aa62c0cced0d DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B 6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f SHA512 80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7 SHA512 9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23 -DIST Botan-2.19.4.tar.xz 6099528 BLAKE2B c35dfec5aad13c76fe09b33f97a72d15f84bfd6c434cae89be13c3fd3e6f7deaa9ea21474890bb6a1f4fa7d23369c32b9fc747862233eac33c8c88dbc912d31f SHA512 2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8 -DIST Botan-2.19.4.tar.xz.asc 488 BLAKE2B b8b7db32d61859778c0866e782ed94ef89ba48a0f0f2289d9452fe7f540ae37ad495cb7eede68199d9bed8e23f695e1860c0d379cd4c35c92de8c45db167b68a SHA512 e00c4e2944655919507300650d81fbee03dd22d1a84cb8135848ea9ee061ca4d4dfada618643193143c0123e56f22e4a6d3a26c73923d872754d80dc2a4779c5 DIST Botan-2.19.5.tar.xz 6140148 BLAKE2B ab3a133a84c1beb2efd32fcb1746c13ec58cf24cf28cea43c93e9dd4b45c65a47225ff92139e34e1470cf150f839794e3bbd316df5e72a060f11d03141002b79 SHA512 323930fbabd833a6affd71f90835e4ca31a9632e346dee9c5f396aca898697d0f2993b860f739d02cdf49fa7fbb3a2d306c4790e5d5f39620b2dea284983669c DIST Botan-2.19.5.tar.xz.asc 488 BLAKE2B 7d52f66f7495ccc249a58ec30206234a9ea4420bcc6e6412593a975bec1173afe55bbcd2c0cbe3859a3fdf547464d3d2949bc03dcb9dbd25c4d5c97589f48202 SHA512 3ba185cf077c109d183fff14270fa60c7be01fd87077e233e6473365111ba83d41448db6d5b5849fe1194c47e84cc2da91a0f75c30ea43538772f13138e472fa DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce SHA512 ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795 DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B 9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744 SHA512 f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9 DIST Botan-3.2.0.tar.xz 8998204 BLAKE2B f21e7574af93ab3331607f4a4ecf1b2cbbc0db4b510ea8ad19a5286d46d3a8e37e13746d2d4751eb16a70fdc8371b4435b030ef0a17f1ab6dcd76bd81bb3a4fa SHA512 526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9 DIST Botan-3.2.0.tar.xz.asc 488 BLAKE2B f7bc716dd18eedf35928933e22c75de3d2731330dfdaf8a5048e8ad86e1f3896ea55294a64b7f82593af16dd2e4097a9ba68f25baa024e175b7334478bcf84a6 SHA512 3ee42ac73e1bd6cea0a2e9f468b88d67c02a4a69786c41ddf9fc7f94b6847be00e0f3f0f38f934ab599b8d6dd29006414294df8b371f5cf2422292f3dd176756 -DIST Botan-3.3.0.tar.xz 7164024 BLAKE2B 051a24c28e6858fdff2af15d01a871ebe5bab11d773be821c0a56a55c725c91cf3119280195ac736f4df83305c1d4910430e6b26deded0d4c634e5c2fc23b389 SHA512 90930add225a2b4376046b3ed0177c71e7d19e983fb2b99c40751de5e6c3959b520eaa1e836782eb02ebc8aff8e9a4fd928f585de5e6b1798a8ad4aa0464f19b -DIST Botan-3.3.0.tar.xz.asc 488 BLAKE2B 043538ff2572a449d4d9ad4bba6d7cab78865e924f712d1b4d4aad9f378cc417f07c19a25adefa22b6e1c06259a50880414c11ce8d3ad1e7f815cf458dbbe6b8 SHA512 c951079c22665966b96cf18c20df7b709353b42dab4aeb33d021b4a8abbc0f06d8fe909f1a5db3e736b4f93b17374d8f832f7aa9f25757a5d5ab1604320581b2 DIST Botan-3.6.1.tar.xz 7581864 BLAKE2B 744eed158e021d26b9414b3a098e017e6e2c2160fc7fb6a0f24f6cbbb4b08501157108dedd7a71fc3645e27c86608a9ba5d18a11087adfd1c9b174ca3ce85b30 SHA512 06327c55bee5e0d2e142f81b997dd8a1ef98f61ef920b57f6eb4e80ebf6b3de1c62373b889d4a32e62509495792e0b46d5dcc82a6446266974b4d4ead8d9f287 DIST Botan-3.6.1.tar.xz.asc 488 BLAKE2B 3538c941f707a182f86226dfdbb8222570671e0bce3ca61137a5d978c2b1f5e658ffc1168d7e73a1861210adfac8aa661124c9cbc4950973f7b1e2c3360aab90 SHA512 871c6d91368d8a080e704afb53b1339c6d06aa57aaa45f260bccf1cb1ed31c635587ba930f954ab55668a7ca13b89b2f2acba3c0f1723e3f7190c6ebe9dc2e0b EBUILD botan-2.19.3-r2.ebuild 5084 BLAKE2B 4e38d5f419f00e83691cc0eabf70679ef9c2b3ca6583de89bdd629ff047b7ed2fb42e8a577b4352bd5702925de8df0c4c1694562d2fa7b37a3599e13af276da9 SHA512 018dc521bc66d71373865307debdf1bd556b8c663fde27a8e2abb1ab96ce783851024255d8059b0c0146f6ea33d8c43469e77d07996bf3c4ccc7b69a90c0c65a -EBUILD botan-2.19.4.ebuild 5158 BLAKE2B 851298f127c510589a3f1a19fef3485318e8ec7bc90f197101cc8d0950cfd935b9f8299d8994135d1d1c6790da5ef5d9492322d6ec2f193b50f7ef6dcd20b05e SHA512 1f3c042a943b5e51d2c10d62ea96e6772457423667f8803ea39e8443f74641be99893eb0015f179c2a9a0440d1a8fccf81134eb963fae5d03ec289ad5a032a4d EBUILD botan-2.19.5.ebuild 5228 BLAKE2B 4c058bdca20c9c31ad2287d71686820d211011228183c0ee448b9ee41132d1593e29a950f436c58b3a0bbb360eeccb6673f0b2b2a4210988249d1da4290afbc5 SHA512 79981d9c133f0df7c5bbf494d8eca30c47295ab44759eb60f567978a879ecdd3ed3c7537b968a7c5a933b3ed794d34b3c9102d435bf3b950a3784ce5ed153e8c EBUILD botan-3.1.1.ebuild 5687 BLAKE2B 2a54f03f4c60f34a426306a440c961d8c670d353dc309eece4b89c251e280a3025faf8c46d76b5f3c2778678fb5302bffa4d13192b7c49b83ff2c4830bd53cf9 SHA512 039403784b9e5314fbf44491a075337e82b88a872965d9c4ec230c9e62b72d2758fb22c0270232faaf07c6de85bc6c9476986f5a264b5253cdb147f8d6c0fd09 EBUILD botan-3.2.0-r1.ebuild 5949 BLAKE2B d3896126f123289ba540718729e96b72fb5c40527be15fe3b7921040210014efdb65748c4dc601130949bf48fced3864f746915ee9ada72f77d85120fbf85a10 SHA512 623175e58b1b045757ff939c05b1cc55357e0d32b76485027ab45179adc5278eb01f46bac5b944ebbb00e0fcb6963da4ae7202721546c306dc0355e7bb747161 EBUILD botan-3.2.0-r2.ebuild 5974 BLAKE2B 0d13e2fd6b89cd5cd4254b0d4d109ce1df29f7e191df73c453786db9e2c134fc79a7faa592147c0bd780e1ea2e0d0c230b51402e028ea1b45f6fa188e20cd8a5 SHA512 d1ec5f53985ddcd8ef65439385a9fa4b33be4686e8fbcedf1c7c3b15eeb74dc635bf46bbba39195e6a5487297ac71e68b9442c129ab36d92c60b8d366dfde1f3 -EBUILD botan-3.3.0.ebuild 6000 BLAKE2B 536ec0d6f2b6d832bcd2bfe5a8ecc9f1656ec644fb023dafd0592a5b1492b13fdb9ee75d5c9a6589b822a3882aec19ca35dc737766d4cd073cac7357e1225acb SHA512 179a8f6c557b4d797bb2508d409c0bfff23d35b7d46cc398a888f7f0a6a4e05049800f0dfc62505b7b1448b92a81c3b53001645dd4fd0395848b79336f268009 -EBUILD botan-3.6.1.ebuild 6028 BLAKE2B 7d0f1b20d19aa9a621884c68ff8bfd3b03490fa73c419e500f671fb569ffecd5b87c2872a7c32833886a6801563b2ddfa2f240c2e5241b4010d9f6395504080e SHA512 b3bc760fe23468bd88abe86b8ffbc1bc45a24dc5ad09cf3e5bf12cb2cc22115743e84c49e6c0e870f68a235ac79cce391a1f8ca2d13d937e1da3b139ff899592 +EBUILD botan-3.6.1.ebuild 6069 BLAKE2B cf5672fe7c34d288ad52702625eacaa7ee702b1762849114cf271a973a34f5fc4fdd61625e987e0a7904476f96be4f4040dead03e3cfccd58b241357540508a7 SHA512 3f3aca4dca31a801d6ddb70fea5395f6755a54c9ac9e112c597064f0c458437d58c668313ab1c1c0ab104668369bc0c329ec5b223ed612c704a90602a4994d1b MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d diff --git a/dev-libs/botan/botan-2.19.4.ebuild b/dev-libs/botan/botan-2.19.4.ebuild deleted file mode 100644 index b35aa44c46b2..000000000000 --- a/dev-libs/botan/botan-2.19.4.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc -inherit edo flag-o-matic multiprocessing python-r1 toolchain-funcs verify-sig - -MY_P="Botan-${PV}" -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2" -# New major versions are parallel-installable -SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -# Unkeyworded because of https://github.com/randombit/botan/issues/3916 -#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos" -IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" -CPU_USE=( - cpu_flags_arm_{aes,neon} - cpu_flags_ppc_altivec - cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} -) -IUSE+=" ${CPU_USE[@]}" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# NOTE: Boost is needed at runtime too for the CLI tool. -DEPEND=" - boost? ( dev-libs/boost:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -RDEPEND=" - ${DEPEND} - !<dev-libs/botan-3.0.0-r1:3[tools] -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ') - verify-sig? ( sec-keys/openpgp-keys-botan ) -" - -# NOTE: Considering patching Botan? -# Please see upstream's guidance: -# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches - -python_check_deps() { - use doc || return 0 - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -src_configure() { - python_setup - - local disable_modules=( - $(usev !boost 'boost') - ) - - if [[ -z "${DISABLE_MODULES}" ]] ; then - elog "Disabling module(s): ${disable_modules[@]}" - fi - - local chostarch="${CHOST%%-*}" - - # Arch specific wrangling - local myos= - case ${CHOST} in - *-darwin*) - myos=darwin - ;; - *) - myos=linux - - if [[ ${CHOST} == *hppa* ]] ; then - chostarch=parisc - elif [[ ${ABI} == sparc64 ]] ; then - chostarch="sparc64" - elif [[ ${ABI} == sparc32 ]] ; then - chostarch="sparc32" - fi - ;; - esac - - local pythonvers=() - if use python ; then - _append() { - pythonvers+=( ${EPYTHON/python/} ) - } - - python_foreach_impl _append - fi - - local myargs=( - # Intrinsics - # TODO: x86 RDSEED (new CPU_FLAGS_X86?) - # TODO: POWER Crypto (new CPU_FLAGS_PPC?) - $(usev !cpu_flags_arm_aes '--disable-armv8crypto') - $(usev !cpu_flags_arm_neon '--disable-neon') - $(usev !cpu_flags_ppc_altivec '--disable-altivec') - $(usev !cpu_flags_x86_aes '--disable-aes-ni') - $(usev !cpu_flags_x86_avx2 '--disable-avx2') - $(usev !cpu_flags_x86_popcnt '--disable-bmi2') - $(usev !cpu_flags_x86_rdrand '--disable-rdrand') - $(usev !cpu_flags_x86_sha '--disable-sha-ni') - $(usev !cpu_flags_x86_sse2 '--disable-sse2') - $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') - $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') - $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - - # HPPA's GCC doesn't support SSP - $(usev hppa '--without-stack-protector') - - $(use_with boost) - $(use_with bzip2) - $(use_with doc documentation) - $(use_with doc sphinx) - $(use_with lzma) - $(use_enable static-libs static-library) - $(use_with sqlite sqlite3) - $(use_with zlib) - - --cpu=${chostarch} - --docdir=share/doc - --disable-modules=$(IFS=","; echo "${disable_modules[*]}") - --distribution-info="Gentoo ${PVR}" - --libdir="$(get_libdir)" - # Avoid collisions between slots for tools (bug #905700) - --program-suffix=$(ver_cut 1) - - # Don't install Python bindings automatically - # (do it manually later in the right place) - # bug #723096 - --no-install-python-module - - --os=${myos} - --prefix="${EPREFIX}"/usr - --with-endian="$(tc-endian)" - --with-python-version=$(IFS=","; echo "${pythonvers[*]}") - ) - - local build_targets=( - shared - $(usev static-libs static) - $(usev tools cli) - $(usev test tests) - ) - - myargs+=( - --build-targets=$(IFS=","; echo "${build_targets[*]}") - ) - - if use elibc_glibc && use kernel_linux ; then - myargs+=( - --with-os-features=getrandom,getentropy - ) - fi - - tc-export AR CC CXX - - local sanitizers=() - if is-flagq -fsanitize=address ; then - sanitizers+=( address ) - fi - if is-flagq -fsanitize=undefined ; then - sanitizers+=( undefined ) - fi - filter-flags '-fsanitize=*' - myargs+=( - --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") - ) - - edo ${EPYTHON} configure.py --verbose "${myargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" -} - -src_install() { - default - - if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then - # --docdir in configure controls the parent directory unfortunately - mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die - fi - - # Manually install the Python bindings (bug #723096) - if use python ; then - python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py - fi -} diff --git a/dev-libs/botan/botan-3.3.0.ebuild b/dev-libs/botan/botan-3.3.0.ebuild deleted file mode 100644 index 6c28d228cd2a..000000000000 --- a/dev-libs/botan/botan-3.3.0.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/botan.asc -inherit edo flag-o-matic multiprocessing ninja-utils python-r1 toolchain-funcs verify-sig - -MY_P="Botan-${PV}" -DESCRIPTION="C++ crypto library" -HOMEPAGE="https://botan.randombit.net/" -SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz" -SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD-2" -# New major versions are parallel-installable -SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version -# Unkeyworded because of https://github.com/randombit/botan/issues/3917 -#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos" -IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib" -CPU_USE=( - cpu_flags_arm_{aes,neon,sha1,sha2} - cpu_flags_ppc_altivec - cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2} -) -IUSE+=" ${CPU_USE[@]}" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# NOTE: Boost is needed at runtime too for the CLI tool. -DEPEND=" - boost? ( dev-libs/boost:= ) - bzip2? ( >=app-arch/bzip2-1.0.5:= ) - lzma? ( app-arch/xz-utils:= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3= ) - zlib? ( >=sys-libs/zlib-1.2.3:= ) -" -RDEPEND=" - ${DEPEND} - !<dev-libs/botan-2.19.3-r1:2[tools] -" -BDEPEND=" - ${PYTHON_DEPS} - ${NINJA_DEPEND} - $(python_gen_any_dep ' - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ') - || ( >=sys-devel/gcc-11:* >=llvm-core/clang-14:* ) - verify-sig? ( sec-keys/openpgp-keys-botan ) -" - -# NOTE: Considering patching Botan? -# Please see upstream's guidance: -# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches - -python_check_deps() { - use doc || return 0 - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - # bug #908958 - if tc-is-gcc && ver_test $(gcc-version) -lt 11 ; then - eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" - die "GCC version is too old to compile Botan!" - elif tc-is-clang && ver_test $(clang-version) -lt 14 ; then - eerror "Botan needs >=gcc-11 or >=clang-14 to compile." - eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" - die "Clang version is too old to compile Botan!" - fi -} - -src_configure() { - tc-export AR CC CXX - python_setup - - local disable_modules=( - $(usev !boost 'boost') - ) - - if [[ -z "${DISABLE_MODULES}" ]] ; then - elog "Disabling module(s): ${disable_modules[@]}" - fi - - local chostarch="${CHOST%%-*}" - - # Arch specific wrangling - local myos= - case ${CHOST} in - *-darwin*) - myos=darwin - ;; - *) - myos=linux - - if [[ ${CHOST} == *hppa* ]] ; then - chostarch=parisc - elif [[ ${ABI} == sparc64 ]] ; then - chostarch="sparc64" - elif [[ ${ABI} == sparc32 ]] ; then - chostarch="sparc32" - fi - ;; - esac - - local pythonvers=() - if use python ; then - _append() { - pythonvers+=( ${EPYTHON/python/} ) - } - - python_foreach_impl _append - fi - - local myargs=( - # Intrinsics - # TODO: x86 RDSEED (new CPU_FLAGS_X86?) - # TODO: POWER Crypto (new CPU_FLAGS_PPC?) - $(usev !cpu_flags_arm_aes '--disable-armv8crypto') - $(usev !cpu_flags_arm_neon '--disable-neon') - $(usev !cpu_flags_arm_sha1 '--disable-armv8crypto') - $(usev !cpu_flags_arm_sha2 '--disable-armv8crypto') - $(usev !cpu_flags_ppc_altivec '--disable-altivec') - $(usev !cpu_flags_x86_aes '--disable-aes-ni') - $(usev !cpu_flags_x86_avx2 '--disable-avx2') - $(usev !cpu_flags_x86_popcnt '--disable-bmi2') - $(usev !cpu_flags_x86_rdrand '--disable-rdrand') - $(usev !cpu_flags_x86_sha '--disable-sha-ni') - $(usev !cpu_flags_x86_sse2 '--disable-sse2') - $(usev !cpu_flags_x86_ssse3 '--disable-ssse3') - $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1') - $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2') - - # HPPA's GCC doesn't support SSP - $(usev hppa '--without-stack-protector') - - $(use_with boost) - $(use_with bzip2) - $(use_with doc documentation) - $(use_with doc sphinx) - $(use_with lzma) - $(use_enable static-libs static-library) - $(use_with sqlite sqlite3) - $(use_with zlib) - - --build-tool=ninja - --cpu=${chostarch} - --docdir=share/doc - --disable-modules=$(IFS=","; echo "${disable_modules[*]}") - --distribution-info="Gentoo ${PVR}" - --libdir="$(get_libdir)" - # Avoid collisions between slots for tools (bug #905700) - --program-suffix=$(ver_cut 1) - - # Don't install Python bindings automatically - # (do it manually later in the right place) - # bug #723096 - --no-install-python-module - - --os=${myos} - --prefix="${EPREFIX}"/usr - --with-endian="$(tc-endian)" - --with-python-version=$(IFS=","; echo "${pythonvers[*]}") - ) - - local build_targets=( - shared - $(usev static-libs static) - $(usev tools cli) - $(usev test tests) - ) - - myargs+=( - --build-targets=$(IFS=","; echo "${build_targets[*]}") - ) - - if ( use elibc_glibc || use elibc_musl ) && use kernel_linux ; then - myargs+=( - --with-os-features=getrandom,getentropy - ) - fi - - local sanitizers=() - if is-flagq -fsanitize=address ; then - sanitizers+=( address ) - fi - if is-flagq -fsanitize=undefined ; then - sanitizers+=( undefined ) - fi - filter-flags '-fsanitize=*' - myargs+=( - --enable-sanitizers=$(IFS=","; echo "${sanitizers[*]}") - ) - - edo ${EPYTHON} configure.py --verbose "${myargs[@]}" -} - -src_compile() { - eninja -} - -src_test() { - LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1) --test-threads="$(makeopts_jobs)" -} - -src_install() { - DESTDIR="${D}" eninja install - - if [[ -d "${ED}"/usr/share/doc/${P} && ${P} != ${PF} ]] ; then - # --docdir in configure controls the parent directory unfortunately - mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die - fi - - # Manually install the Python bindings (bug #723096) - if use python ; then - python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py - fi -} diff --git a/dev-libs/botan/botan-3.6.1.ebuild b/dev-libs/botan/botan-3.6.1.ebuild index e47afaa7b00d..7488dcffd9ec 100644 --- a/dev-libs/botan/botan-3.6.1.ebuild +++ b/dev-libs/botan/botan-3.6.1.ebuild @@ -58,6 +58,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-boost-1.87.patch "${FILESDIR}"/${P}-tests-glibcxx_assertions.patch + "${FILESDIR}"/${PN}-3.6.1-no-avx2.patch ) python_check_deps() { diff --git a/dev-libs/botan/files/botan-3.6.1-no-avx2.patch b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch new file mode 100644 index 000000000000..a4794738d6cd --- /dev/null +++ b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/946821 +https://github.com/randombit/botan/issues/4493 +https://github.com/randombit/botan/pull/4494 + +From c7f8f6c0967faac1ba66ca3d55560b2aed12863a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com> +Date: Mon, 23 Dec 2024 09:29:07 +0100 +Subject: [PATCH] FIX: SM4 GFNI needs AVX2 + +closes #4493 +--- + src/lib/block/sm4/sm4_gfni/info.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/block/sm4/sm4_gfni/info.txt b/src/lib/block/sm4/sm4_gfni/info.txt +index 4c5867f9b72..5b5c87b42e7 100644 +--- a/src/lib/block/sm4/sm4_gfni/info.txt ++++ b/src/lib/block/sm4/sm4_gfni/info.txt +@@ -9,4 +9,5 @@ brief -> "SM4 using Intel GFNI" + + <isa> + gfni ++avx2 + </isa> + diff --git a/dev-libs/crossguid/Manifest b/dev-libs/crossguid/Manifest index 37249f0df7c2..0825305015b6 100644 --- a/dev-libs/crossguid/Manifest +++ b/dev-libs/crossguid/Manifest @@ -1,6 +1,4 @@ AUX crossguid-0.2.2_p20190529-gcc-13.patch 702 BLAKE2B 2fc8ee7f1ce45a1e32c371c0f9e58b2c29dea5060e408cef2888b1c29df0fd755ee719a697dbb63c8a256982d637f67731bb2608a3437772c1f3c02b146c1f92 SHA512 445a4bd99e739816121d6c53513e93afe4fc2fec01100ba77d501b3509aee78e9e878d43ad5a41ed6326a9e4b484eea07144c88df201f5a3df21e7563eac7adb DIST crossguid-0.2.2_p20190529.tar.gz 141660 BLAKE2B 0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527 SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf -DIST crossguid-0_pre20150817.tar.gz 46569 BLAKE2B 3384b6c507c4713f5ea0d6012138f3543445a42c7353e934e267b91275f7cf75720a446f5fe24f334b1022946f856a65f5c158d0036c999c761e626c1e30062a SHA512 823ca301f1d3b78a778649cd9169194d98dd33c65cadd5bfb9f86429e82049c99c17e09f093b92675981d2aac2aac25b60cbb157fad57a3e1bada826edd8ba0a EBUILD crossguid-0.2.2_p20190529.ebuild 1053 BLAKE2B e6cf04c12c1d4effa2b51dfaf29854ef79bee0692f7bc57653da3957cdb65c2e4d2b31644f7c9c20b9a31432c78853821edb62775fdc3669c330ca89ce6e06bc SHA512 92578f24973c250732cdce96905538db3c39bca4ac0042eaa530b516dede38fbec70f88b81ca8a387d3aee860f80d75f4dfe560831bd8099e118971a3a8c44a0 -EBUILD crossguid-0_pre20150817.ebuild 1032 BLAKE2B c1df37cf03445d2ce715aeb69f01b46127c1ad6f9cbd7b5cf6078366dfcc0b64d13dd0c60fecd693337198de1ae0ea2ad248e2244e491f2108dd3231891304cd SHA512 c36850a6125f41fb0015bdb7608da91daf742caca8476b7741dd6953b0f4960d7b24d9d0ea7a22f2a7dddb2dc48cbd06b5a2408c3dc0c2e6ac3127a04cd8a49a MISC metadata.xml 250 BLAKE2B 3eed42090c61630ad5ee992ff42e44e7dd0ada2d5c592a17704a41227e269a92ef865f94b8b8c8a183fdb70416c72b4443a36aa32a80cd564ca607da9efecdef SHA512 9dd0ce1118a790f7fb41e03b4de0c0f8ba90fbdab93f9b92c6bd443c92b8c6a3816f257b7f0953c216fee3726c3b48628d6fdd66e26a51e50738f832ebcc98fb diff --git a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild b/dev-libs/crossguid/crossguid-0_pre20150817.ebuild deleted file mode 100644 index 9c61857673ce..000000000000 --- a/dev-libs/crossguid/crossguid-0_pre20150817.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/graeme-hill/crossguid.git" - inherit git-r3 -else - EGIT_COMMIT="8f399e8bd4252be9952f3dfa8199924cc8487ca4" - SRC_URI="https://github.com/graeme-hill/crossguid/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -fi - -DESCRIPTION="Lightweight cross platform C++ GUID/UUID library" -HOMEPAGE="https://github.com/graeme-hill/crossguid" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -# We use libuuid from util-linux. -DEPEND="sys-apps/util-linux" -RDEPEND="${DEPEND}" - -RESTRICT="test" #575544 - -e() { echo "$@"; "$@"; } - -src_compile() { - e $(tc-getCXX) \ - ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - -std=c++11 \ - -c guid.cpp -o guid.o \ - -DGUID_LIBUUID \ - || die - - e $(tc-getAR) rs libcrossguid.a guid.o || die -} - -src_install() { - insinto /usr/include - doins guid.h - dolib.a libcrossguid.a -} diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest index 7f51d6b948c9..a80e16e82dd1 100644 --- a/dev-libs/hidapi/Manifest +++ b/dev-libs/hidapi/Manifest @@ -1,5 +1,3 @@ -DIST hidapi-0.13.1.tgz 244666 BLAKE2B b3406114f8dd8b192eecac1673592866f930688af8023819d20f73c76226f0829c8d68f4b47051b4836ce4348fc3bbad8f9849f1d565563dcd0f993df43de4ca SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53 DIST hidapi-0.14.0.tgz 348221 BLAKE2B 6472bfe5863d75a8901983a763191f3b6c18c25934b652b79f33141a6818619f816d35ed2480435254cecc51598d1e07e53c8c8c4f35a10cf28c1e4374bb450d SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac -EBUILD hidapi-0.13.1-r1.ebuild 997 BLAKE2B c4dc2b1165ed8726150f028ecc2d9f918a50a7d7a1e1bab75f8979e87b063011ed484d615f060f20d65c3d9ecab0c6775e606e1bfba3526a3bb0d2b93f56edb3 SHA512 3847877088c4066b253ca0568be71148ba938aadf528553930ea4d7f7f11475e410f260872cee7b561bc89a309d4cd9ea0d1451bad38e86b5b28165f9f439039 EBUILD hidapi-0.14.0.ebuild 1097 BLAKE2B 660e06972bb86c0a8c29f6248d0af216ac589b65916009f7269740124565500c100fac8e3f72da3440ef60cb684544824769bc4d9234b3496d97d3aea1c77b84 SHA512 2b33c748fa19f0b3061935593d31c243a1db17dbfe34cff64c01e2524f0b17a59b1b4b5a93ac17d372bc8ec8055d213aac895e5f913954cc098b2fc5a4b92e7c MISC metadata.xml 251 BLAKE2B d70038e59ac59fef8a55bd2780ba018fcbf9a56fc39759c854156c3621b1b2b7d22991bdfe2fa656648bdff4016b538104524964e82e5de25d074b1dd2b3b23f SHA512 7625d9218dc92b5156a3f766fd278f3f7969aa9726e653c39d77e1e935baef834ffc0bfc4f47dfb929ec60a765a266e5886552b1f311ca8b161a0cda4bfcdae4 diff --git a/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild b/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild deleted file mode 100644 index 2e02a10b8d7d..000000000000 --- a/dev-libs/hidapi/hidapi-0.13.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices" -HOMEPAGE="https://github.com/libusb/hidapi" -SRC_URI="https://github.com/libusb/hidapi/archive/${P}.tar.gz -> ${P}.tgz" - -LICENSE="|| ( BSD GPL-3 HIDAPI )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="doc" - -DEPEND=" - virtual/libusb:1[${MULTILIB_USEDEP}] - virtual/libudev:0[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND=" - doc? ( app-text/doxygen )" - -S="${WORKDIR}/${PN}-${P}" - -multilib_src_configure() { - append-lfs-flags - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if use doc && multilib_is_native_abi; then - cd "${S}/doxygen" - doxygen Doxyfile || die - fi -} - -multilib_src_install() { - cmake_src_install - - if use doc && multilib_is_native_abi; then - local HTML_DOCS=( "${S}/doxygen/html/." ) - fi - einstalldocs -} diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest index 72ab9d3192e8..643ffbfbbff8 100644 --- a/dev-libs/intel-metrics-discovery/Manifest +++ b/dev-libs/intel-metrics-discovery/Manifest @@ -1,7 +1,7 @@ AUX intel-metrics-discovery-1.12.170-revert-definitions.patch 1410 BLAKE2B af7ef84fd1181bc10ee890d87121e78559dcfb7b561334e6041b5c20b183d4ebfdd94e6b773e4c604284b5368708b312a23f878a0df7d0b32fad7f1dfdce7044 SHA512 2a66efe9b1f4d78cb053d4621d063ed7bcca061b677ca9a68f589096c4ae1c32c463dd5a598912afd690a96fc3c52aaa8cdc2e7f684870b939a43cd40507eea2 AUX intel-metrics-discovery-1.12.178-revert-definitions.patch 1538 BLAKE2B 66dba96f5b96758bf12ce4643281a77483db955ecebc87689a08e67a0e9e7c4ff12dc3c6aef1a20bb39714b7b38736404e27ccac273be0c3dd22812ce80b8af2 SHA512 d0920c54f2281d25175c8afef0140db8f82cd75a16e309257630ccc7e20f3979da98b24b7fabb4edee32c87f05cbb160dea84128b173e6314caadf79a51a4d77 -DIST metrics-discovery-1.13.176.tar.gz 5398346 BLAKE2B a50920e78404069bc92adbb06b5fa932680a03f8e72845c927aa8f8943eddd03805fad3e25ee5da5407e31a3209f7662b8cebc19fb9bbfd4d2df10b57225f138 SHA512 2c1aaa701a01700672ef1f45d86a8f78582be8f9ec9b160b94a1f1ba82f0567cb6bfafe2ff0cc9e0d3e5406215b7a402635ac128dae8382301077b3cb5ae2836 DIST metrics-discovery-1.13.178.tar.gz 5398480 BLAKE2B f36a239318d7050f6abcb3cf9a9b12e9aea9b87a91a73dcd32f1d3d02addaf70f168fc8b17b19edcd2abfda2288170076237c9e8f9ce4c37cbb103b8faf68fd5 SHA512 d4fd142f23d06fff281106490d790eb81fe7cbf5fb4d2b57d796807aedaddb975a85d4c11880a867d6e60545eae106841cabbae6f80d9663f787b1aa3dd8af7d -EBUILD intel-metrics-discovery-1.13.176.ebuild 691 BLAKE2B e562e3a6bcb819f50796babd59a3df56245dde150f218ee5c34937868a98ae85ba7a1c78a3cb8bfcd9225608620519a13f870cb0fa32e89acf5b1aedfbec6e73 SHA512 184d5e63a6f5c1679e2ba3387f4c8c49ca26e6c21f75ae9dabca286fd763f12adc84d144992a7826cd692b983250d23279846c758d91d9d756c055d964250361 -EBUILD intel-metrics-discovery-1.13.178.ebuild 692 BLAKE2B 4ff5b890b29cc9f05396ea5e7d50f6fb0ef5e659985047cdff9609596a8012617efbbbc7ab6134459801bf80bbcde47afcfe1d91df7134dfac34fb4cac2fb8e2 SHA512 c8f006e24307e36d703e819884a0eafbb454a73dce54e775fe7c9c33523834b96b3cb982c4f96dc5cf5d711925a16adaf18396bdbaa99fa9a90173c98428fc29 +DIST metrics-discovery-1.13.179.tar.gz 5630041 BLAKE2B 0a7d44eb70550c0e68b6402e077c3ec3798cd7f50fb894d836d0d361398edc0886ca8114085c76313cfec3c72f041521174291cbe3dcdc42bef8d1001798efd3 SHA512 4e50c0c34f0d0b4470ede001d35ceebd838508e4125dd7e3572ad3d521affa15f20af4551c039f167c79b44a96a4f206aa122c8cbb030377b9584bf8ae9fb737 +EBUILD intel-metrics-discovery-1.13.178.ebuild 691 BLAKE2B a8b82782461a2d62e644c8857531a0038069c7e0cf963873abf2d9281b6aeadf5faa344454374be3577cb132ecd8221783a2a8e344a78e15cd2c09dccd8cc0ff SHA512 77f8d54a883607342a165b9af06f72081467716345e1094bbd3b40c255fe76e41b4b848df1d6d7da7d2d5f4a62adf1f637799466dd8c317e891c8e5e03c438b0 +EBUILD intel-metrics-discovery-1.13.179.ebuild 692 BLAKE2B 4ff5b890b29cc9f05396ea5e7d50f6fb0ef5e659985047cdff9609596a8012617efbbbc7ab6134459801bf80bbcde47afcfe1d91df7134dfac34fb4cac2fb8e2 SHA512 c8f006e24307e36d703e819884a0eafbb454a73dce54e775fe7c9c33523834b96b3cb982c4f96dc5cf5d711925a16adaf18396bdbaa99fa9a90173c98428fc29 MISC metadata.xml 815 BLAKE2B 017d27f513969fab6dd984946f3105d8bf0f2c0f29251976016f3b4aff779a22d66ad876bf00553376314681c2ee33beb53c0537a37a80824692001710164c8f SHA512 76548770278fa9004b250a5e8e6b273e49a0aff112e3e1508653c8b4119ed7ec486191ab39f6d22c425b0b07d77b29fc299d36d8faa7167b8af564bb1418aa6c diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild index fa161df3c12e..c6731ce7f26b 100644 --- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.178.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND="x11-libs/libdrm" RDEPEND="${DEPEND}" diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.176.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild index 728ed054c227..fa161df3c12e 100644 --- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.176.ebuild +++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.13.179.ebuild @@ -16,12 +16,12 @@ S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64" +KEYWORDS="~amd64" DEPEND="x11-libs/libdrm" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-1.12.170-revert-definitions.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.12.178-revert-definitions.patch" ) src_configure() { local mycmakeargs=( -DLINUX_DISTRO="Gentoo" ) diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest index c9fb484887e1..5881d2a5a5c4 100644 --- a/dev-libs/intel-metrics-library/Manifest +++ b/dev-libs/intel-metrics-library/Manifest @@ -1,5 +1,5 @@ -DIST metrics-library-1.0.173.tar.gz 280677 BLAKE2B 0394809b6a7f4d82cae96f045356a474846ff94d8362fea701ed811ecb45c4127aa2a64e66bd77aff37eb555b511159f87c8f459a601a1e98383b42c13987d48 SHA512 45f599e4299072d62c9e4cb205d52ad29492e36120b1f542a89f9e1767e7025cef56774d70ef8233ace7a69863056e8db8ba9ff4f9c6a95fa06508c6be7d9345 DIST metrics-library-1.0.178.tar.gz 279352 BLAKE2B 20a95639c270f84f0fb773f80799593e800d74034dc2d5913fe1bede26ca8dd777b994610adf9bbe81314c2d1043f66ef086e3292f1c99f1b44f67a3a80810f1 SHA512 52f1580a3eafea678ec3d27b89097d8710ecc5dc710ad2a414b805799af0a70d32fd0d57894bbe99eca7855df142331fdf387270efe0b7240c867c5c108dfbed -EBUILD intel-metrics-library-1.0.173.ebuild 633 BLAKE2B 10d9fbdd4de30327faa87dd340f00ca339a4750910471a31b22da5281ee7d55603d7d503c170686a1775e963e861804e28bbdebee5f3c4d0cc09b3698db371ee SHA512 2b0e123ade3403b8efbc683830ff1c5e6f5e161ef3e7436aa11a697f1d9d4cb99280ac1e97df9cb6adeef5cf83c03e750b5699c9d8769f91e42eb256021056d8 -EBUILD intel-metrics-library-1.0.178.ebuild 634 BLAKE2B 572e75602397b4e39d6bccaf74764af3d822e1781177b9cccadf5b48e618142263d580de949db8ac5bc62023f4b95df27ce0bfe5c024c56c9b5ff601d4c99105 SHA512 5e230e144da1d7c55de3c019c775cfdafd01ac29e418267263ace05d78f49907368931bfd21ae61afb6b240bb6d1321a394c6cb9e0fc34f56578de4d11531a99 +DIST metrics-library-1.0.182.tar.gz 271427 BLAKE2B 16431e1d4010f762a220876bf72b10d87f3c86478ed4f89fad0a56dbd04c2e95da7ef5a89f4f9fe443705d7ca9c8a78891f4eb69046f1e62c8b9dd1fafe18422 SHA512 5632956a5fd541840aa59a88a01a8b498ea94ed27a36f644e65bcfefdfef1e73d36908925d0b00f60bb152953227f1d17e882f554187695944e0b5b09751d3a2 +EBUILD intel-metrics-library-1.0.178.ebuild 633 BLAKE2B 10d9fbdd4de30327faa87dd340f00ca339a4750910471a31b22da5281ee7d55603d7d503c170686a1775e963e861804e28bbdebee5f3c4d0cc09b3698db371ee SHA512 2b0e123ade3403b8efbc683830ff1c5e6f5e161ef3e7436aa11a697f1d9d4cb99280ac1e97df9cb6adeef5cf83c03e750b5699c9d8769f91e42eb256021056d8 +EBUILD intel-metrics-library-1.0.182.ebuild 634 BLAKE2B 572e75602397b4e39d6bccaf74764af3d822e1781177b9cccadf5b48e618142263d580de949db8ac5bc62023f4b95df27ce0bfe5c024c56c9b5ff601d4c99105 SHA512 5e230e144da1d7c55de3c019c775cfdafd01ac29e418267263ace05d78f49907368931bfd21ae61afb6b240bb6d1321a394c6cb9e0fc34f56578de4d11531a99 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild index 86657df2d0c0..553a918ad5e3 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.178.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND="x11-libs/libdrm" RDEPEND="${DEPEND}" diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.173.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild index 553a918ad5e3..86657df2d0c0 100644 --- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.173.ebuild +++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.182.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="amd64" +KEYWORDS="~amd64" DEPEND="x11-libs/libdrm" RDEPEND="${DEPEND}" diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest index 925a3a7278dc..47ccbb2fe762 100644 --- a/dev-libs/level-zero/Manifest +++ b/dev-libs/level-zero/Manifest @@ -1,7 +1,3 @@ -DIST level-zero-1.18.3.tar.gz 1186811 BLAKE2B ded186ca410e6d261e5139c6e4a8e02fd31d34a2fe14a3cd973586c286ddf86af074480daeed840183c96e8ba83a82826a9b504a99ec253377f2e94ad3c60b5a SHA512 b881a81cd4d0c83db7d68cb41ba50729686cb923161aca4e5f0b75b7a4d143cf51636bd1b19decbec1d70d70e20ac4e6b11fa8c207b556a147c5425c87a4f2ef -DIST level-zero-1.18.5.tar.gz 863581 BLAKE2B c726adc912b48ecd826998b6c1b566826ee8261a08b545d293450c36375015bf24dae1c24532e7b12fad7365df2e970184be7ae693cfaeecc88aa0472a2230de SHA512 68d7e0f7a4eba7b4b6d9e110348bd8ba700475cb13407ddbe3d275c1386eaeb785509cbb7f43ad8abf6a96a3de25c4e0e9b529ca994283eb885651944ec02760 DIST level-zero-1.19.2.tar.gz 891887 BLAKE2B 9f7fb43f36e3d67ed43110a7868572fccb3423401257b158f23f38dcbffddecdef1bd4147ac4b59c2b51eaa29f3dd5cac34f1639358806ea70b405923f9f4909 SHA512 45ce777712ed4dad766a4de6808acaf2588345907c6dc039c5c2f56076b6ecbd0cdcddae6c14531f3e8b6b261b7d4f0302f82ff629f98fc62f5b03cfeb633d2d -EBUILD level-zero-1.18.3.ebuild 847 BLAKE2B 178c502c126bd22af06daba8f63f7ac2b5c808147017f3e2583d1fe0ff3ac6ed70b1bbc9c6d1e3935007be8304d0b09f125bffe15802272944363d846c4b4ab8 SHA512 6fcf7d58fed14661f1c5600dfe1a19bec1802453cb3b747d94ac8a8288f1b8ad9b4f0d3a470605aa18ee46005dc69dda442191d617d13d82dee62620533ce47a -EBUILD level-zero-1.18.5.ebuild 848 BLAKE2B 2a96f2e41da5a7b2fb463e9ef09bb0286fb5175685201df2ca0b6f59cfc0ffb2cd6e2116d9e42fb4abf9e0fc523349c66a513fb0ce137a1784910c131da56342 SHA512 c48c444f22d0e98e6dffe1342c0b6c404cf0964079106848cc2e92bdf878df1c602ad3b01afcd94970b4696833cb6c88926ab39a4831775deb17cf12094a04dc -EBUILD level-zero-1.19.2.ebuild 848 BLAKE2B 2a96f2e41da5a7b2fb463e9ef09bb0286fb5175685201df2ca0b6f59cfc0ffb2cd6e2116d9e42fb4abf9e0fc523349c66a513fb0ce137a1784910c131da56342 SHA512 c48c444f22d0e98e6dffe1342c0b6c404cf0964079106848cc2e92bdf878df1c602ad3b01afcd94970b4696833cb6c88926ab39a4831775deb17cf12094a04dc +EBUILD level-zero-1.19.2.ebuild 847 BLAKE2B 178c502c126bd22af06daba8f63f7ac2b5c808147017f3e2583d1fe0ff3ac6ed70b1bbc9c6d1e3935007be8304d0b09f125bffe15802272944363d846c4b4ab8 SHA512 6fcf7d58fed14661f1c5600dfe1a19bec1802453cb3b747d94ac8a8288f1b8ad9b4f0d3a470605aa18ee46005dc69dda442191d617d13d82dee62620533ce47a MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e diff --git a/dev-libs/level-zero/level-zero-1.18.3.ebuild b/dev-libs/level-zero/level-zero-1.18.3.ebuild deleted file mode 100644 index 68249c1101f3..000000000000 --- a/dev-libs/level-zero/level-zero-1.18.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" -HOMEPAGE="https://github.com/oneapi-src/level-zero" -SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64" - -RDEPEND="dev-libs/spdlog:=" -DEPEND="${RDEPEND}" - -src_prepare() { - # Don't hardcore -Werror - sed -e 's/-Werror//g' -i CMakeLists.txt || die - - cmake_src_prepare - - # According to upstream, release tarballs should contain this file but at least - # some of them do not. Fortunately it is trivial to make one ourselves. - echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die -} - -src_configure() { - local mycmakeargs=( - -DSYSTEM_SPDLOG="ON" - ) - - cmake_src_configure -} diff --git a/dev-libs/level-zero/level-zero-1.18.5.ebuild b/dev-libs/level-zero/level-zero-1.18.5.ebuild deleted file mode 100644 index 4034c8711d28..000000000000 --- a/dev-libs/level-zero/level-zero-1.18.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="oneAPI Level Zero headers, loader and validation layer" -HOMEPAGE="https://github.com/oneapi-src/level-zero" -SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" - -RDEPEND="dev-libs/spdlog:=" -DEPEND="${RDEPEND}" - -src_prepare() { - # Don't hardcore -Werror - sed -e 's/-Werror//g' -i CMakeLists.txt || die - - cmake_src_prepare - - # According to upstream, release tarballs should contain this file but at least - # some of them do not. Fortunately it is trivial to make one ourselves. - echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die -} - -src_configure() { - local mycmakeargs=( - -DSYSTEM_SPDLOG="ON" - ) - - cmake_src_configure -} diff --git a/dev-libs/level-zero/level-zero-1.19.2.ebuild b/dev-libs/level-zero/level-zero-1.19.2.ebuild index 4034c8711d28..68249c1101f3 100644 --- a/dev-libs/level-zero/level-zero-1.19.2.ebuild +++ b/dev-libs/level-zero/level-zero-1.19.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND="dev-libs/spdlog:=" DEPEND="${RDEPEND}" diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest index 660be9be3457..d15f08faeb38 100644 --- a/dev-libs/libgnt/Manifest +++ b/dev-libs/libgnt/Manifest @@ -1,4 +1,5 @@ AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416 +AUX libgnt-2.14.3-ncurses-opaque.patch 2410 BLAKE2B 02b6de0336519f85a80836654cd280158eca7b40b1a84e0f5c8b74a35719b44e90cec00a02c0deb74cdb42c8838828db161a9aadacefb28baaf9e5f8b21f2093 SHA512 7af56b316f3ece2740e3916fd6fc291918e8a1a9c57049bb53b2f3251c623b82948009e7f4c9f22844ae9b837f182572ae19ae457dfc126232f2a4edf6f27b48 DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8 -EBUILD libgnt-2.14.3.ebuild 921 BLAKE2B bb959f94de0e80cf0dd88545bfe4ccaca1ad092ec502a481b0230094e119015dd46e9077b79d0927cb131c54c3672819d413b3e27134e7766b296a72c1c078f7 SHA512 122011639af29e5f370f60b034bac12f97c3dbcd4c83460b45e5b29591813b0b391c7f0728a18e681062e6e5ba7febbe4cd54353f50fab919a39657a69b7537f +EBUILD libgnt-2.14.3.ebuild 969 BLAKE2B e99f1aa0c5c9934a29073e1eb5c653aa4b0de2db6ef19ebe2c2ca5209df10e258960f22cf67708acf22234c4bde9e0f6501267da268888b843b32d83d3a98dad SHA512 9fe593b261e027c24f53894157dca55757b853543a59421c32f336da863c5934b5146541a41e6306dae20de78f3fb4e235507017fbe4d88d53298c2d5f2f4297 MISC metadata.xml 244 BLAKE2B 712aad52336f293671d3f59fd0a8f82b2e1490ece1c499fe2eb163895ba6fd9af4268c23d396de8ee4420139e3b33af18702a1ecaba5ce89e177e2f4bbb0c156 SHA512 63917f78ba2986f9ad72fbd373903d41876d6399e68f4142561dd39f41b82be610937c005579a76ac25e19ec10fb6a4c297e796bfb4ab839e073f68bdf2bfda2 diff --git a/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch b/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch new file mode 100644 index 000000000000..19e4a4d82121 --- /dev/null +++ b/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch @@ -0,0 +1,61 @@ +https://bugs.gentoo.org/928976 +https://src.fedoraproject.org/rpms/libgnt/blob/rawhide/f/libgnt-2.14.1-gcc-14-fix.patch +--- a/gntwm.c ++++ b/gntwm.c +@@ -166,38 +166,40 @@ + int sx, ex, sy, ey, w, y; + cchar_t ch; + PANEL *below = panel; ++ WINDOW *window = panel_window(panel); + +- sx = getbegx(panel->win); +- ex = getmaxx(panel->win) + sx; +- sy = getbegy(panel->win); +- ey = getmaxy(panel->win) + sy; ++ sx = getbegx(window); ++ ex = getmaxx(window) + sx; ++ sy = getbegy(window); ++ ey = getmaxy(window) + sy; + + while ((below = panel_below(below)) != NULL) { +- if (sy > getbegy(below->win) + getmaxy(below->win) || +- ey < getbegy(below->win)) ++ window = panel_window(below); ++ if (sy > getbegy(window) + getmaxy(window) || ++ ey < getbegy(window)) + continue; +- if (sx > getbegx(below->win) + getmaxx(below->win) || +- ex < getbegx(below->win)) ++ if (sx > getbegx(window) + getmaxx(window) || ++ ex < getbegx(window)) + continue; +- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) { +- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK) ++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) { ++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK) + goto right; + w = widestringwidth(ch.chars); + if (w > 1 && (ch.attr & 1)) { + ch.chars[0] = ' '; + ch.attr &= ~ A_CHARTEXT; +- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch); +- touchline(below->win, y - getbegy(below->win), 1); ++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch); ++ touchline(window, y - getbegy(window), 1); + } + right: +- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK) ++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK) + continue; + w = widestringwidth(ch.chars); + if (w > 1 && !(ch.attr & 1)) { + ch.chars[0] = ' '; + ch.attr &= ~ A_CHARTEXT; +- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch); +- touchline(below->win, y - getbegy(below->win), 1); ++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch); ++ touchline(window, y - getbegy(window), 1); + } + } + } + diff --git a/dev-libs/libgnt/libgnt-2.14.3.ebuild b/dev-libs/libgnt/libgnt-2.14.3.ebuild index ed67e5575771..cacf0932823e 100644 --- a/dev-libs/libgnt/libgnt-2.14.3.ebuild +++ b/dev-libs/libgnt/libgnt-2.14.3.ebuild @@ -8,9 +8,9 @@ inherit flag-o-matic meson DESCRIPTION="Pidgin's GLib Ncurses Toolkit" HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt" SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc" @@ -18,7 +18,7 @@ RDEPEND=" !<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 - sys-libs/ncurses:0= + sys-libs/ncurses:= " DEPEND="${RDEPEND}" BDEPEND=" @@ -29,6 +29,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.14.0-tinfo.patch" + "${FILESDIR}/${PN}-2.14.3-ncurses-opaque.patch" ) src_configure() { diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest index 5b828895a68f..60245cee248e 100644 --- a/dev-libs/libiconv/Manifest +++ b/dev-libs/libiconv/Manifest @@ -1,4 +1,8 @@ AUX libiconv-1.16-fix-link-install.patch 968 BLAKE2B 29d67eb01de00f68b1245a8fe521caf3da262ac0d78da615aeec1e67e08220e6366e1cf708775217e94e282a7b6c236edc322016c3ebdb37486f5e789e4655a1 SHA512 fe5b5376f491df5ef2d01496232e56742b86d52ef043dad21993cb4f463b404c0b8bfaf46ef7fb0d3d8f19504af9875b5096c6a4392ec0666416e0389b1d1923 +AUX libiconv-1.18-fix-link-install.patch 988 BLAKE2B 745c46ae3b37c3eb0688d0eef7d67db66149e9afd943bb4a74cf22fed360739248cff831fd01b87dbbf198e737547b1829f38be3eab7abe37f68ef6161396fe9 SHA512 e205f0c4adfaa65ee30fba2c18d4e5ebfbbbe6a0e720478b89fa8fec6946b7ac345a1027abaec69314223c8f928d46a0022d36751b2c4f7105e1e7770acee8b6 DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a9181d4734a8bb1e86861dfd66f1a6c0846a90b5b88f3b38b1fa9983d9e563551f27e95a8e329896b71becceae52b SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 +DIST libiconv-1.18.tar.gz 5822590 BLAKE2B 374e7a7299d4814d372d8e63246c11f403f9fc990be5b129d016b92a875d2f8e9697ef4ef5cbd2e7b7fc97dff427c6b8abf6a99da792fcabd6fc36af38cd4723 SHA512 a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a +DIST libiconv-1.18.tar.gz.sig 833 BLAKE2B 30ca06b40201c08b871f1b62cecfb32c9489c97bc2d109566b993d30d8ee735b7e067d89676c48685da823ee532da61173f30b6c1956c30ef1da16d22dd35b4c SHA512 7814bb202b8d68041e4ee96427794a998e53e73ddf94a3ac81f78b08065aa7879d9c03e325e51f13b2d78361d163472cdc633be1c8f535150a3f0257b319ec52 EBUILD libiconv-1.17.ebuild 1391 BLAKE2B a5a9677a73b3911fb135fdc50174e9db39124b7d52d6d074edcf9f092c39eafe8944243c2d9e8943510be1d6a20302bf0fbf0bcf19e22c1907dab37beea3b606 SHA512 3ad8283c4c22eed8f5071cf11aae77c9eec2659d654fff37b16b36f8acd39c403ab71c6ed6a28c8e0fe4e2299d11d724b2164f43e9079e7f2750d78a5cce7baf +EBUILD libiconv-1.18.ebuild 1629 BLAKE2B 4bf2df037b2ccc7ef5f30be71a8291dabe17c92740c593a362a1e758e200dd87d54f998e9df92c547b866c0b7442f51013684e6bf77bd48645b3cc7f0e8cf72a SHA512 76a8046eead922ac6b06d7af11f5bbf0db6412483e8bdff0db6058a4c1b2f0aea991f048cdc02de1ffc2e76d1e323bc4ef0d4ae3f3646ebb3e31159e29265538 MISC metadata.xml 565 BLAKE2B e1824f37ee0d144611b3540fef8b3c96b2c28c78b91ff7f9a1963ef50478349210ae7a699ea1d9dbafe5cb06927a61e577f337e3e76c3093825a4012290ff1ba SHA512 faa191289678ad09c0f608fcc747d0803a922429e846733cce3f1be64096794c69039be903117c9700d314abd1957c99173906d6acd2e3cb8b43edda1a0be9a8 diff --git a/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch b/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch new file mode 100644 index 000000000000..8091ca1b49fb --- /dev/null +++ b/dev-libs/libiconv/files/libiconv-1.18-fix-link-install.patch @@ -0,0 +1,12 @@ +don't link against the libtool archive to avoid recording ${D} in RUNPATH + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -113,6 +113,7 @@ install : all force + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ ++ *) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ $(DESTDIR)$(libdir)/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) diff --git a/dev-libs/libiconv/libiconv-1.18.ebuild b/dev-libs/libiconv/libiconv-1.18.ebuild new file mode 100644 index 000000000000..6e9fc18574d3 --- /dev/null +++ b/dev-libs/libiconv/libiconv-1.18.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc +inherit multilib-minimal verify-sig + +DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" +HOMEPAGE="https://www.gnu.org/software/libiconv/" +SRC_URI=" + mirror://gnu/libiconv/${P}.tar.gz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig ) +" + +LICENSE="LGPL-2.1+ GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="prefix static-libs" + +DEPEND=" + !sys-libs/glibc + !sys-libs/musl +" +RDEPEND="${DEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.18-fix-link-install.patch +) + +multilib_src_configure() { + if use prefix ; then + # In Prefix we want to have the same header declaration on every + # platform, so make configure find that it should do + # "const char * *inbuf" + export am_cv_func_iconv=no + fi + + # Disable NLS support because that creates a circular dependency + # between libiconv and gettext + ECONF_SOURCE="${S}" \ + econf \ + --cache-file="${BUILD_DIR}"/config.cache \ + --docdir="\$(datarootdir)/doc/${PF}/html" \ + --disable-nls \ + --enable-shared \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + use static-libs || find "${ED}" -name 'lib*.la' -delete + + # We need to rename our copies, bug #503162 + cd "${ED}"/usr/share/man || die + local f + for f in man*/*.[0-9] ; do + mv "${f}" "${f%/*}/${PN}-${f#*/}" || die + done +} diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest index 6a9c9c9a5b03..372546fb789c 100644 --- a/dev-libs/libmodbus/Manifest +++ b/dev-libs/libmodbus/Manifest @@ -1,6 +1,4 @@ AUX libmodbus-3.1.11-cflags.patch 297 BLAKE2B a4710989cb7b8b7719c7fad3de8c7fdcba39a010cb49921708691a2f497a4a7d5d3e7ae4ffb9032a5c86424b2b1667c9eefccfabf901c52e251a77a46c4a8d88 SHA512 7195407080e02ba4768aeb944efcedef4d7ca0ae86397029f332afb324e7f68cecf9ef6a19807f85a998f7587fe01245e6db9e773a231b3de6a755de359d00f2 -DIST libmodbus-3.1.10.tar.gz 463325 BLAKE2B ea1c54e52f0927e9e97b2303b35925d6a40b30f1eed881eeed2d05a229c858ebdde6212431699e24a331744b30f447dfe6704c7ca0d4eb73d193ae5b5055c4b3 SHA512 d9a56d2cd3285823b287b6bf4f79741f2e626e09cfc1872405a306e8dcc0f64c15695e8aee45614071c615cd248b87293ef2351c830120a515d28303bad0ccee DIST libmodbus-3.1.11.tar.gz 478276 BLAKE2B 7fb6c5cc05bca71067b377211da78046abefb9bd74c8f0f0c567324ea7c874d7aa509e2d67f9a1fd9288719e87fdbca280cf4d5612e222f1ef0ef613b2fae988 SHA512 76192230c548640b0954b471aa5d346488115d0690bd932370814f442de56c4316002a5f0288f5955a4b396168ebe7c463a40a029e57df16c7fa4b3d83af6acb -EBUILD libmodbus-3.1.10.ebuild 690 BLAKE2B adf47b3463e698daba8b23f060243ea71aa464252fad1e77c401647a1a20e71ee0c5b361410af6aabe8aa8803d30a08fcbf899458ce657cd8b59606824081115 SHA512 23ad79d565fa84c21a337a61405c6cf911e06f4f753092fd58f9b64f1a0cb6ec444601303f2290d405af031792a509e4ecafb803dff3723f237c21faa843e5fc -EBUILD libmodbus-3.1.11-r1.ebuild 803 BLAKE2B 27fda707c512d50f93406fdf74b4f31c8999f035e0b24b5899e878105f279cc727a6c150073c41cb6ce40d19e066d70032f4da0f4693518681e68b257d70f997 SHA512 9805cda0f49701e5471f4a0232b11b6b04271d4299882d743605f5fb271e3ea9d42ec84c2d31286967493db5d210b7bf0ab31f2c1c5762ac57ee0f349a764790 +EBUILD libmodbus-3.1.11-r1.ebuild 824 BLAKE2B 97b09e4b33d46d0f26b706db68afe12c6f848dddf2e88aa8ee1d4e40014fac772e44461a7ffbceebe1ba863fa11e4d0a654f056b25280d2e169686f2137c3881 SHA512 612927df799b6aafd71673152566f4b9af02da5ea0f2ea5c424d27f1626da95917d7d55975032ecd4c4b26ffcc566a5d40dc536cd6a0b601ee4da5784629c674 MISC metadata.xml 400 BLAKE2B 13cbac9e5f8b0b4af1330ef236dff85b8d3f167cabb19979942fa610c525c9d0b532e5c6a359f716ab198872f622dbbbe9575fc1ab53f82b8abe8e4996e6d921 SHA512 248080a171c05cca240271d8dc3e7cd0b30e78100697dddf0a0d8216d4d0c42abc9c52731b0abaa5de9dbacf9c402ada6e1b406699b7eefdb0ede78717d587c5 diff --git a/dev-libs/libmodbus/libmodbus-3.1.10.ebuild b/dev-libs/libmodbus/libmodbus-3.1.10.ebuild deleted file mode 100644 index 0faa7ec5b0df..000000000000 --- a/dev-libs/libmodbus/libmodbus-3.1.10.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link" -HOMEPAGE="https://libmodbus.org/" -SRC_URI="https://github.com/stephane/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -src_configure() { - local myeconfargs=( - $(use_enable test tests) - $(use_enable static-libs static) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi -} diff --git a/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild b/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild index 1fdfa0e1065b..57d673a40480 100644 --- a/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild +++ b/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild @@ -13,7 +13,9 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86" IUSE="static-libs test" -RESTRICT="!test? ( test )" + +# Tests are for manual testing +RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-3.1.11-cflags.patch" ) diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest index be00226c0c83..1c9fc5db62d9 100644 --- a/dev-libs/libpfm/Manifest +++ b/dev-libs/libpfm/Manifest @@ -1,6 +1,4 @@ AUX libpfm-4.13.0-musl-WORDSIZE_undeclared.patch 518 BLAKE2B b88b0f7f27954a0d74e8fdf159555e62cdb3cb1fbba370d419d9a10dab3c43a5fbbd943c852f258339e38d52ebd33e2ed11fb5477e9b620fd35f752ac0013b26 SHA512 59c6e9b912d97f133a50531d31238e0bfa745a518cb8be42c2bc0a7516e1736130c312f0f8be79875305aae2bd3542bdc827c1048d9c1933a8ce23ae7d5c9fc0 -DIST libpfm-4.12.0.tar.gz 1109288 BLAKE2B 035133d98305317b8331de9f3d986bf37b290cc80d2b944e9bac1c48a8659984ac190a0af1abe64bd9e0fee465f31ca11e3a35702f8a8da8a8a480a1aa625ac7 SHA512 dc47d862d619241db4a077a98b3f71a68f04be1be41e10c7b7dd2e596e6c79e9e0ff1d1028798dfb280553f98296b4b57339b4e6675749e1497dc1c9de06d9f8 DIST libpfm-4.13.0.tar.gz 1128221 BLAKE2B 71fddec8993acec5c14d140d80804d41a12ae2fe22368b74bf94f10f95f51946bf9150b4329ca481756228366fc86b1ff5f795a97de181d211dc175c374a5653 SHA512 e61b210aa2ce80f0e47603c88eee2e4f2fe30ca2c0e194a5472b6a8de3bf9dc1085e5261bbb9ddbe5b6531c4b391fb34f20d038e5ebd8e6f4c14c2112aee508f -EBUILD libpfm-4.12.0.ebuild 989 BLAKE2B ad16fd930e06927adb7dc649e281719881228723c3b051efd8b25b47da7fbbba631ce5332a06dfb346cf678656638de876f69d3ea259a3eeb5e7477c334b0e3b SHA512 323798d793de52d76a267a2d2e0582785ab790804ccf7bfdc25f170364bc8c5ec9c2580171b97b778b162510968c9968a2ca4fb06ad9be7f573f65fdf651bd1a EBUILD libpfm-4.13.0.ebuild 1112 BLAKE2B 3365cf20df649b35a75d30830e6fccfa5bdeeaf64c5e650d41c6910f1a1172a37f471610a4d84b69294af91abd616100e770ad789d657ea6f8c41e13a2a627e6 SHA512 a44627747b4d175361b3d281884a5d8c2057f1a70cd573e9cefabb14204e0af9da5dfdcdfba7410c07e83b891c933ee23bb45c7bb83ea178766422985e50c9f4 MISC metadata.xml 246 BLAKE2B 08a76e53ab8da2beee24c0920d47104aefd113853da0d9295967f0db8800717ea4486bddfb9ea1dd83039bb8f8deaf99edb834e2ed2bfe0207282130c7878a90 SHA512 7123d176941aa889b85a3fb204987908d69d05cfe577678b8e8bb0a4512b6a274dfb7e0ad1d2f5d93078512b78f89227712fdd3262fed332caafcaa40ffbc735 diff --git a/dev-libs/libpfm/libpfm-4.12.0.ebuild b/dev-libs/libpfm/libpfm-4.12.0.ebuild deleted file mode 100644 index 9d276743e6f5..000000000000 --- a/dev-libs/libpfm/libpfm-4.12.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Hardware-based performance monitoring interface for Linux" -HOMEPAGE="https://perfmon2.sourceforge.net" -SRC_URI="https://downloads.sourceforge.net/perfmon2/${PN}4/${P}.tar.gz" - -LICENSE="GPL-2 MIT" -SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="static-libs" - -src_prepare() { - default - - sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \ - -i lib/Makefile || die - sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \ - -i config.mk || die -} - -src_compile() { - # 'DBG=' unsets '-Werror' and other optional flags, bug #664294 - emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG= -} - -src_install() { - emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install - dodoc README - - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest index ea0c33831fc9..b32856202134 100644 --- a/dev-libs/metee/Manifest +++ b/dev-libs/metee/Manifest @@ -1,3 +1,5 @@ DIST metee-4.2.1.tar.gz 101949 BLAKE2B 03878099f372276cb1f1a464ecb8c9f31e4aad5e85ba02b9c821ec9483c1749f99368a6ecfcb6e9426b6f09d04356f2aa96122a485c8d69a424271a8b76221af SHA512 e2be12d17c236afb10a3deba9d85686c3e26637320995b3af8f370aa689fd5415974b3e8a8e3935c864efa40e37055d4a10476df9691db6a42a2e723bd939788 +DIST metee-4.3.0.tar.gz 103084 BLAKE2B 9cd9b104bc2c3e3613e281b5191670f76a41f86784ce64d26695de29e56e01cbac864f04e3102abcbbca8946a347ce1541051488018c9925457d753ae793f1f4 SHA512 faab2837dc3afaf0cfea3e638e437a76cf7e8fa5e9d72ce9095d85abb8a836e5e041f87b24b523f158855c869d7535200e2beec2526c25d96a592ce62e599c7c EBUILD metee-4.2.1.ebuild 773 BLAKE2B e54aab5132f4df48ac9f7ced4588d5689db3d77b93e058c9ffce2284529d9c4867b63d232b15f93b9d481ccbd1566e393974fe542fc93730bd12752e49cfa725 SHA512 2dcdaff2195ec878c0acea9ce23d58c9020ce6af58df4d6493a79887f7403aa26666b0e116c975b6907e5eb806b958a4d64c87027a0eedc93e7d9d47a1336d93 +EBUILD metee-4.3.0.ebuild 774 BLAKE2B 44b3c51b84bf470ea9a3b5cf7a46ac6e2a4a6aec43d636c55678f1f955de77e1cb32cb0202251c49f9acfc42e0a3b70e3dbb532ee801c6daa2b3c09423779b85 SHA512 67297c660dc29006ee939e1770739847970456485b22475ab3042e479a867561c59a77c075451facc702d7d69fb207489a374ac95fb840546e59f38d9fe41864 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1 diff --git a/dev-libs/metee/metee-4.3.0.ebuild b/dev-libs/metee/metee-4.3.0.ebuild new file mode 100644 index 000000000000..eb83679eaa02 --- /dev/null +++ b/dev-libs/metee/metee-4.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Cross-platform access library for Intel CSME HECI interface" +HOMEPAGE="https://github.com/intel/metee" +SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="doc" + +BDEPEND="doc? ( app-text/doxygen )" + +src_prepare() { + default + cmake_src_prepare + + # Respect users CFLAGS + sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCS="$(usex doc)" + -DBUILD_SAMPLES="NO" + -DBUILD_SHARED_LIBS="YES" + -DBUILD_TEST="NO" + -DCONSOLE_OUTPUT="NO" + ) + + cmake_src_configure +} diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest index cf1bf377c3d7..aae65a4b3b09 100644 --- a/dev-libs/miniz/Manifest +++ b/dev-libs/miniz/Manifest @@ -1,9 +1,3 @@ -AUX miniz-2.2.0-fixincdir.patch 641 BLAKE2B e98354c7898ecff64ee65bdf42229f29315a59e5e10403104fceaf484bee6ede44ed265e50b767bc80ba622140a15ecf8467e1ca43ed7d74f2fa0d0285f5a6de SHA512 17a0f183aa7257e1eb5a8ba044e3e37f7a5903489883c4655b7976996aa85cde9c7d4c25c1487db3fa30cefe0c5adc72641f21185e9eded2d9890a086c485d05 -AUX miniz-2.2.0-fixpcpath.patch 768 BLAKE2B 63f3b6be8be1266b6f3e2db16c0ed42ffefec7b6575a107745775bc1f7c47c463febd6e58e331962b7b2a8aea52379fee1bb6de9fa3921ae470760eb4f0ec9e7 SHA512 049e384397075954a6f581bc8d888e0130a02fda864a79d60f199c77c3305ea5d4bdcd41779985f273fda583e2e9009137eee6133b962041b85b1b08a1d9509c -DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 -DIST miniz-3.0.1.tar.gz 115742 BLAKE2B 4727e55bf2ad4cf716677e6135912df61b9081f2a3a2d6a13efc77ff64a1ec8e736c089330106a81f613dac3840bc09f3aea93f6b432d832f14a6b12ba534d70 SHA512 c1cf028ceb6c12abc83ffb636753d9470155e055d2e834ab23c1c1bc9ee2ef7c7fec689cb92e3496336f850e1d1675489b0450b84e4c7e68d7066142d8df76b6 DIST miniz-3.0.2.tar.gz 115766 BLAKE2B 57260dc5d2f382f85fb7648d4e9fb9fcca63689cdd75f27b3cf84266b112e04031cc6b5f298e3155d4b8fd635704c713572c8ed76b5a8a2f0adb737c63051f1d SHA512 426054403121f84a2ac365f7545b35fb217b41061aebaffce483568d3d374d453ab87987c599a85f1f745e0ec7144a3181ed9b100f354e2823f165ba286b0611 -EBUILD miniz-2.2.0-r1.ebuild 618 BLAKE2B 865468f23a94308548ed2d3bd11714d8df9e93c9aae606481ac931ee71091f05e018b8ed0aa4797addb5902ef67ad5d6c025591e080b948c1904221b5473d1ac SHA512 280b72dd97630072d258789fa1c78d877d44cfb72f364aa2b34c89ab904a7944169c39226e9ee3f21d3998a99130ee8e65f4d0c283ab94f40292e860fe489068 -EBUILD miniz-3.0.1.ebuild 442 BLAKE2B 91ee14a26ffe5e4b6f36b4937d688b8df5bd025ab706e359214d7042fe938d413d5d925f27f823f6a4105c5d01cabca05799b123cc5197a4f839e5418d92f54c SHA512 9749c91264349716ecb6e9ec2f4a05debac2164a0fdfc0552b55175ef949783d77437f11d8fbb06d30a62a7e9f5975a86e61e564c85acded4369066a787cef30 EBUILD miniz-3.0.2.ebuild 437 BLAKE2B 189b73926741bf489b748d401520bb9935bb54e5058ba74bed3ece3b37fe0fe37019a46f171c156aeb1a4493fb766116221154af3809f4ab065542785f397dcd SHA512 e684fefe9b1a067c20da5a88b7bcd3939b223b38f07656a0f09c0a8cffd9b5fcac51c29788c5c45ac57a719a76ac6cf353ba982cfe97a367b58761bd81d52b50 MISC metadata.xml 1039 BLAKE2B abcf47a1154eada5c2f5fbe0629f1f065db0f81db5202e58aac598b8b88237bf953eb4aa5c973e70e8371fc7ef4a033a4a7f8c1da83507c477509440f737ad2c SHA512 48f92a799a49ae6dd6ed589a50f746cccd9ab87e2e5370dc63c98c6ac663037a0d1d57f04a8170bd319bb5d17bfa16b4451b71a0df38233fc5a47c902927c690 diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch deleted file mode 100644 index e0379baf49e3..000000000000 --- a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 37ea28133d9abea3926248c9517676be9b558ca7 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Sat, 4 Jun 2022 09:31:06 +0100 -Subject: [PATCH 2/2] build: Set pkgconfig includedir to miniz directory - -Allows users to include <miniz.h> instead of <miniz/miniz.h> which -seems to be the intended behaviour. ---- a/miniz.pc.in -+++ b/miniz.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} - libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/miniz - - Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch deleted file mode 100644 index 37f8c7737819..000000000000 --- a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9cd715b3b1f5accc2e7cd0b167808c1a47a08938 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Sat, 4 Jun 2022 09:22:37 +0100 -Subject: [PATCH 1/2] build: Install .pc file in correct directory - -/usr/share/pkgconfig should be used for architecture independent -libraries (e.g. data or scripts), while an architecture dependent -directory like /usr/lib64/pkgconfig should be used for native -binaries. - -Co-authored-by: Sam James <sam@gentoo.org> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,7 +173,7 @@ if(NOT BUILD_HEADER_ONLY) - if(INSTALL_PROJECT) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc -- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif() - endif() - diff --git a/dev-libs/miniz/miniz-2.2.0-r1.ebuild b/dev-libs/miniz/miniz-2.2.0-r1.ebuild deleted file mode 100644 index af58c8669669..000000000000 --- a/dev-libs/miniz/miniz-2.2.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A lossless, high performance data compression library" -HOMEPAGE="https://github.com/richgel999/miniz" -SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86" - -PATCHES=( - # https://bugs.gentoo.org/849578 - # https://github.com/richgel999/miniz/pull/239 - "${FILESDIR}"/${PN}-2.2.0-fixpcpath.patch - "${FILESDIR}"/${PN}-2.2.0-fixincdir.patch -) - -DOCS=( ChangeLog.md readme.md ) diff --git a/dev-libs/miniz/miniz-3.0.1.ebuild b/dev-libs/miniz/miniz-3.0.1.ebuild deleted file mode 100644 index 0824c6fd4634..000000000000 --- a/dev-libs/miniz/miniz-3.0.1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A lossless, high performance data compression library" -HOMEPAGE="https://github.com/richgel999/miniz" -SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" - -DOCS=( ChangeLog.md readme.md ) diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest index 2885a02a8d29..29af68679ab7 100644 --- a/dev-libs/opencl-icd-loader/Manifest +++ b/dev-libs/opencl-icd-loader/Manifest @@ -1,5 +1,3 @@ -DIST opencl-icd-loader-2023.12.14.tar.gz 93193 BLAKE2B 13b0e085dddfd1d3d493dac40984b18b839a58c2a72a8a0684a353391d9fa80888567d97e7de06caa4f0f8255bb9747b88c218ead112dca3c1df971339aded5b SHA512 b30aa0b856e6c73450fc23f768201ac01d3c5519a14305c79127debc6407be656b68ae2bd527bb7225d4268865f7bdf0b384279eb78b2806725d37ab940bf56e DIST opencl-icd-loader-2024.05.08.tar.gz 93262 BLAKE2B eb7ac8783a96d1fc4756527f0fe46657fbd57486b2e49c56ddcd67162cf850d652108d31f32b21f9eb24488f2dac8a5891af04bb905d65fb495637167f10ea8a SHA512 12d62183e49c5a1f813807291744d816008afca55b09f5acf2eef1bce50a453bf35a8dfbeb5f433022b0c5517f0a210d7123a3bac7a15ea63cc10f3bc71510f0 -EBUILD opencl-icd-loader-2023.12.14.ebuild 960 BLAKE2B c447febd17a8edd9b357b69294d181ea3095b98d471e143748eac1c8d63f19efe466b5934e4dc66951912ec1d6b76ad5444a0f8945e4f52fb8b6cca366849570 SHA512 03ed97a1dfad170f3cedd3485500ea019bafe9ea48b0591859ccbe6cdfd5e57313b49da8ac0519f9d0fca1e7eb71067a37875f82dd6070486e3ddb9f1f5bbf84 EBUILD opencl-icd-loader-2024.05.08.ebuild 949 BLAKE2B 11e45285374cd7c2e11c0cdeedd15ab6f9f76460552db641b9d31478a97d3d7c23d09a728a6526bc2c672343d480d6cebc5ce72596b8aaae1fc9bd15f845a5f9 SHA512 15a9519e7642dcc9b8b8ab965a740ce59fac7794942dd7310113983721303ce98ee90ad413bd76d02ddf7683a201418ed6b384f81423ec6121a0f1a52bdb35f2 MISC metadata.xml 263 BLAKE2B 4403b25dbfff8d1b594f992d783efb2eb588312e3aef33be514a8e15cc938f8e8affb3e21f213dddfc896b75998c65337add7502bc462fb06ff30ef8c5bfef94 SHA512 c6c1fe5a93d231074c9b424a0b410858677df65766306b037401318d7fe281af94125c46794d0a40ba5910be4b8622a2126b921e62839742d0f2b0aab88fa84e diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild deleted file mode 100644 index abed85a0a6dc..000000000000 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2023.12.14.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib multibuild prefix - -MY_PN="OpenCL-ICD-Loader" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Official Khronos OpenCL ICD Loader" -HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader" -SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~loong ppc64 ~riscv x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND="!dev-libs/ocl-icd" -DEPEND="${RDEPEND} - >=dev-util/opencl-headers-${PV}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - hprefixify loader/icd_platform.h - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - ) - cmake_src_configure -} - -multilib_src_test() { - local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" - local -x OCL_ICD_VENDORS="/dev/null" - cmake_src_test -} diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 4423b28bee25..f3aad19def48 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -7,10 +7,6 @@ AUX openssl-3.0.13-p11-segfault.patch 2275 BLAKE2B 842cc10d6a81b2859729b0024dd82 AUX openssl-3.0.15-CVE-2024-9143.patch 7034 BLAKE2B 79963b250e9faa0a9764945d05f0598c0eda64ac87b12e545698d86c299c769b1ff8300f3289e620fe58183db0d1767834d6d146ce6cdacdeb58c137e88d79fa SHA512 6196f8c963c776ae3412ca76da51060d95e4f50cf1a1e4edb89edf9d32a7dd032a7f650445872a68a6f03dab4b75b601cae4c89e2fda9cf414c7ff26961433c2 AUX openssl-3.1.7-CVE-2024-9143.patch 7033 BLAKE2B 1e2d8ea24fd68e2781808477d60773a3cca5bf122ba3c2a0efba12470126a5768a2f2fa0239a73965bf046644e93d6deecda17e4282243206095c42f3149fb5e SHA512 44185ace09adb75f8124f8a564d1f806fb6fd29e232a6c1f40b1508f510c8b481f86f06d03e169ed6dd2df1e535b723a2f9978199b20225a1e27f499054b7bc7 AUX openssl-3.2.3-CVE-2024-9143.patch 7034 BLAKE2B 7f438bb531b09154368072f66e03fa4fa1c0f1d461ce8e89e942567e9cf60ce0d1986334cbd9c4d8e9b5ea5dc7c2ca0fa5dc111c965d99ebf6800afdd56820ab SHA512 7699ea05a139a7ddcbf68538cfb4329026d99ffa8eb3622b3f0faca92b287f571c6b76c24acd537a3406f209bf90a48704d11ed70d0e49c118d1591b9bae39d2 -AUX openssl-3.3.1-cmake-generator.patch 3263 BLAKE2B 1e6d31175e3ed8abd2b03c94255dbf58d5168038369fd68a98fdf03e3c6d8f74124dd6a7ffa894e492f74ff9440572ae4c04c144967436266033f725c5f7140f SHA512 3c3ae928a2d59489f1fb1d5a57977dbe650530d4715c0a116a2c59dc78385608e50814749d021b1fee51c9b2c0c5ec48631174946c6ca927e0fb5a8ac10514b6 -AUX openssl-3.3.1-pkg-config-deux.patch 12498 BLAKE2B f924e837317bd4a7b4af6e0e8b397915200fb69a7bc09ffd09ab4a860b43ec06b99635fa6ad4783de7d9fa12f9ef48f639e493646e9e7e1e1947c0c729846f81 SHA512 c9f4e93f96db28b7b586ea4d5007e71a13e1464e4c1d033bf1939c8030843727c0e73626affa94d3692a7d285a788ebfd1ce863fe5fd7027a560906a1b6e8b94 -AUX openssl-3.3.1-pkg-config.patch 982 BLAKE2B 77ec5ac862d5b47666e3234f5ef60323d02cbed4a0575e91a45f6f1727f1f0692fc470071622bf982f2875e91c50d9742eb423838702a0019b8c6f7fc2b80149 SHA512 0198461b726a7783d46c0c02cba747affd39245e2ce2577ea802376e1d2dd279eebe9446f30bc2db638d06db1dfacc9b297aa75bbe64ff6f8e22bde3c1063b36 -AUX openssl-3.3.1-riscv.patch 4413 BLAKE2B bf58837c05023bb34edaf6387a5d1f32b6216791643958e972d634d387031461780c34b9209b399f479d908a40ca3b593ea18b1fa80414802bfcdb80db21e1e7 SHA512 b46f2576be603007f767cb7350e3ec74e0ef0832bcc18e50f7b67010e673a6cdcd7099e99d85d53c6693af6b64260e5a92a9aa3f02be1d626421ab7ff73c6f6b AUX openssl-3.3.2-CVE-2024-9143.patch 7034 BLAKE2B 3800addbe31b551224032736f44b9cce721ad6897edfddc6a1db3599e7c7b94e1e4074db8da5883a4439944eb96511fdecae7634bac8ad9a5c2dd11dc2bdf895 SHA512 55449d68c57abc83295de5c869f5b65472c929a29befec7bf74797a3b902febc001535b3c06fe9792d09bd431e72f4d9a2079879c5766acc6adf1359b7d954aa AUX openssl-3.3.2-silence-warning.patch 1078 BLAKE2B 6f7852229a7ac21f217d32efa8075a8612e412444998671c05814c9e581359aa32fd8555abd6d507cd55f4af9aeebb99055c3a376f7f63dc9255090a1fb8d4f5 SHA512 2c91da767be085479e78ee5b20f0c29124da68761157964db67e45e5a3398b3a402837ab611d6e27e4a261912ed08d08387d3b6cdd1168b0da24b808e80fbe52 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659 diff --git a/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch b/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch deleted file mode 100644 index bb8fdbe3f241..000000000000 --- a/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://bugs.gentoo.org/937457 -https://github.com/openssl/openssl/commit/419fb4ea4be4c0b28c63b494ff30fa3510aba06e - -From 419fb4ea4be4c0b28c63b494ff30fa3510aba06e Mon Sep 17 00:00:00 2001 -From: Neil Horman <nhorman@openssl.org> -Date: Sun, 14 Jul 2024 08:57:25 -0400 -Subject: [PATCH] Fix cmake generator - -PR #24678 modified some environment variables and locations that the -cmake exporter depended on, resulting in empty directory resolution. -Adjust build build.info and input variable names to match up again - -Fixes #24874 - -Reviewed-by: Richard Levitte <levitte@openssl.org> -Reviewed-by: Tomas Mraz <tomas@openssl.org> -(Merged from https://github.com/openssl/openssl/pull/24877) - -(cherry picked from commit c1a27bdeb9a4f915aa92ed0e74ed48a1f9b94176) ---- a/build.info -+++ b/build.info -@@ -102,6 +102,11 @@ IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-|BC-)/ -}] - ENDIF - - # This file sets the build directory up for CMake inclusion -+# Note: This generation of OpenSSLConfig[Version].cmake is used -+# for building openssl locally, and so the build variables are -+# taken from builddata.pm rather than installdata.pm. For exportable -+# versions of these generated files, you'll find them in the exporters -+# directory - GENERATE[OpenSSLConfig.cmake]=exporters/cmake/OpenSSLConfig.cmake.in - DEPEND[OpenSSLConfig.cmake]=builddata.pm - GENERATE[OpenSSLConfigVersion.cmake]=exporters/cmake/OpenSSLConfigVersion.cmake.in ---- a/exporters/cmake/OpenSSLConfig.cmake.in -+++ b/exporters/cmake/OpenSSLConfig.cmake.in -@@ -127,13 +127,13 @@ set(OPENSSL_VERSION_FIX "${OpenSSL_VERSION_PATCH}") - set(OPENSSL_FOUND YES) - - # Directories and names --set(OPENSSL_INCLUDE_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::INCLUDEDIR_REL, 1); -}") --set(OPENSSL_LIBRARY_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL, 1); -}") --set(OPENSSL_ENGINES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::ENGINESDIR_REL, 1); -}") --set(OPENSSL_MODULES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::MODULESDIR_REL, 1); -}") --set(OPENSSL_RUNTIME_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::BINDIR_REL, 1); -}") -+set(OPENSSL_LIBRARY_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}") -+set(OPENSSL_INCLUDE_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX, 1); -}") -+set(OPENSSL_ENGINES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}/{- unixify($OpenSSL::safe::installdata::ENGINESDIR_REL_LIBDIR, 1); -}") -+set(OPENSSL_MODULES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}/{- unixify($OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR, 1); -}") -+set(OPENSSL_RUNTIME_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::BINDIR_REL_PREFIX, 1); -}") - {- output_off() if $disabled{uplink}; "" -} --set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::APPLINKDIR_REL, 1); -}/applink.c") -+set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::APPLINKDIR_REL_PREFIX, 1); -}/applink.c") - {- output_on() if $disabled{uplink}; "" -} - set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}") - diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch b/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch deleted file mode 100644 index a5ad9987eb57..000000000000 --- a/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch +++ /dev/null @@ -1,303 +0,0 @@ -https://github.com/openssl/openssl/pull/24687 -https://bugs.gentoo.org/936576 - -https://github.com/openssl/openssl/commit/aa099dba7c80c723cf4babf5adc0c801f1c28363 -https://github.com/openssl/openssl/commit/1c437b5704c9ee5f667bc2b11e5fdf176dfb714f - -From aa099dba7c80c723cf4babf5adc0c801f1c28363 Mon Sep 17 00:00:00 2001 -From: Richard Levitte <levitte@openssl.org> -Date: Thu, 20 Jun 2024 14:30:16 +0200 -Subject: [PATCH] Give util/mkinstallvars.pl more fine grained control over var - dependencies - -Essentially, we try to do what GNU does. 'prefix' is used to define the -defaults for 'exec_prefix' and 'libdir', and these are then used to define -further directory values. util/mkinstallvars.pl is changed to reflect that -to the best of our ability. - -Reviewed-by: Neil Horman <nhorman@openssl.org> -Reviewed-by: Tomas Mraz <tomas@openssl.org> -(Merged from https://github.com/openssl/openssl/pull/24687) - -(cherry picked from commit 6e0fd246e7a6e51f92b2ef3520bfc4414b7773c0) ---- - exporters/build.info | 2 +- - util/mkinstallvars.pl | 133 ++++++++++++++++++++++++++---------------- - 2 files changed, 85 insertions(+), 50 deletions(-) - -diff --git a/exporters/build.info b/exporters/build.info -index 86acf2df9467c..9241dc9b0a658 100644 ---- a/exporters/build.info -+++ b/exporters/build.info -@@ -19,7 +19,7 @@ DEPEND[openssl.pc]=libcrypto.pc libssl.pc - DEPEND[""]=openssl.pc - - GENERATE[../installdata.pm]=../util/mkinstallvars.pl \ -- "PREFIX=$(INSTALLTOP)" BINDIR=bin "LIBDIR=$(LIBDIR)" \ -+ "PREFIX=$(INSTALLTOP)" BINDIR=bin "LIBDIR=$(LIBDIR)" "libdir=$(libdir)" \ - INCLUDEDIR=include APPLINKDIR=include/openssl \ - "ENGINESDIR=$(ENGINESDIR)" "MODULESDIR=$(MODULESDIR)" \ - "PKGCONFIGDIR=$(PKGCONFIGDIR)" "CMAKECONFIGDIR=$(CMAKECONFIGDIR)" \ -diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl -index 59a432d28c601..5fadb708e1b77 100644 ---- a/util/mkinstallvars.pl -+++ b/util/mkinstallvars.pl -@@ -11,13 +11,25 @@ - # The result is a Perl module creating the package OpenSSL::safe::installdata. - - use File::Spec; -+use List::Util qw(pairs); - - # These are expected to be set up as absolute directories --my @absolutes = qw(PREFIX); -+my @absolutes = qw(PREFIX libdir); - # These may be absolute directories, and if not, they are expected to be set up --# as subdirectories to PREFIX --my @subdirs = qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR ENGINESDIR MODULESDIR -- PKGCONFIGDIR CMAKECONFIGDIR); -+# as subdirectories to PREFIX or LIBDIR. The order of the pairs is important, -+# since the LIBDIR subdirectories depend on the calculation of LIBDIR from -+# PREFIX. -+my @subdirs = pairs (PREFIX => [ qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR) ], -+ LIBDIR => [ qw(ENGINESDIR MODULESDIR PKGCONFIGDIR -+ CMAKECONFIGDIR) ]); -+# For completeness, other expected variables -+my @others = qw(VERSION LDLIBS); -+ -+my %all = ( ); -+foreach (@absolutes) { $all{$_} = 1 } -+foreach (@subdirs) { foreach (@{$_->[1]}) { $all{$_} = 1 } } -+foreach (@others) { $all{$_} = 1 } -+print STDERR "DEBUG: all keys: ", join(", ", sort keys %all), "\n"; - - my %keys = (); - foreach (@ARGV) { -@@ -26,29 +38,47 @@ - $ENV{$k} = $v; - } - --foreach my $k (sort keys %keys) { -- my $v = $ENV{$k}; -- $v = File::Spec->rel2abs($v) if $v && grep { $k eq $_ } @absolutes; -- $ENV{$k} = $v; -+# warn if there are missing values, and also if there are unexpected values -+foreach my $k (sort keys %all) { -+ warn "No value given for $k\n" unless $keys{$k}; - } - foreach my $k (sort keys %keys) { -+ warn "Unknown variable $k\n" unless $all{$k}; -+} -+ -+# This shouldn't be needed, but just in case we get relative paths that -+# should be absolute, make sure they actually are. -+foreach my $k (@absolutes) { - my $v = $ENV{$k} || '.'; -+ print STDERR "DEBUG: $k = $v => "; -+ $v = File::Spec->rel2abs($v) if $v; -+ $ENV{$k} = $v; -+ print STDERR "$k = $ENV{$k}\n"; -+} - -- # Absolute paths for the subdir variables are computed. This provides -- # the usual form of values for names that have become norm, known as GNU -- # installation paths. -- # For the benefit of those that need it, the subdirectories are preserved -- # as they are, using the same variable names, suffixed with '_REL', if they -- # are indeed subdirectories. -- if (grep { $k eq $_ } @subdirs) { -+# Absolute paths for the subdir variables are computed. This provides -+# the usual form of values for names that have become norm, known as GNU -+# installation paths. -+# For the benefit of those that need it, the subdirectories are preserved -+# as they are, using the same variable names, suffixed with '_REL_{var}', -+# if they are indeed subdirectories. The '{var}' part of the name tells -+# which other variable value they are relative to. -+foreach my $pair (@subdirs) { -+ my ($var, $subdir_vars) = @$pair; -+ foreach my $k (@$subdir_vars) { -+ my $v = $ENV{$k} || '.'; -+ print STDERR "DEBUG: $k = $v => "; - if (File::Spec->file_name_is_absolute($v)) { -- $ENV{"${k}_REL"} = File::Spec->abs2rel($v, $ENV{PREFIX}); -+ my $kr = "${k}_REL_${var}"; -+ $ENV{$kr} = File::Spec->abs2rel($v, $ENV{$var}); -+ print STDERR "$kr = $ENV{$kr}\n"; - } else { -- $ENV{"${k}_REL"} = $v; -- $v = File::Spec->rel2abs($v, $ENV{PREFIX}); -+ my $kr = "${k}_REL_${var}"; -+ $ENV{$kr} = $v; -+ $ENV{$k} = File::Spec->rel2abs($v, $ENV{$var}); -+ print STDERR "$k = $ENV{$k} , $kr = $v\n"; - } - } -- $ENV{$k} = $v; - } - - print <<_____; -@@ -58,36 +88,41 @@ package OpenSSL::safe::installdata; - use warnings; - use Exporter; - our \@ISA = qw(Exporter); --our \@EXPORT = qw(\$PREFIX -- \$BINDIR \$BINDIR_REL -- \$LIBDIR \$LIBDIR_REL -- \$INCLUDEDIR \$INCLUDEDIR_REL -- \$APPLINKDIR \$APPLINKDIR_REL -- \$ENGINESDIR \$ENGINESDIR_REL -- \$MODULESDIR \$MODULESDIR_REL -- \$PKGCONFIGDIR \$PKGCONFIGDIR_REL -- \$CMAKECONFIGDIR \$CMAKECONFIGDIR_REL -- \$VERSION \@LDLIBS); -- --our \$PREFIX = '$ENV{PREFIX}'; --our \$BINDIR = '$ENV{BINDIR}'; --our \$BINDIR_REL = '$ENV{BINDIR_REL}'; --our \$LIBDIR = '$ENV{LIBDIR}'; --our \$LIBDIR_REL = '$ENV{LIBDIR_REL}'; --our \$INCLUDEDIR = '$ENV{INCLUDEDIR}'; --our \$INCLUDEDIR_REL = '$ENV{INCLUDEDIR_REL}'; --our \$APPLINKDIR = '$ENV{APPLINKDIR}'; --our \$APPLINKDIR_REL = '$ENV{APPLINKDIR_REL}'; --our \$ENGINESDIR = '$ENV{ENGINESDIR}'; --our \$ENGINESDIR_REL = '$ENV{ENGINESDIR_REL}'; --our \$MODULESDIR = '$ENV{MODULESDIR}'; --our \$MODULESDIR_REL = '$ENV{MODULESDIR_REL}'; --our \$PKGCONFIGDIR = '$ENV{PKGCONFIGDIR}'; --our \$PKGCONFIGDIR_REL = '$ENV{PKGCONFIGDIR_REL}'; --our \$CMAKECONFIGDIR = '$ENV{CMAKECONFIGDIR}'; --our \$CMAKECONFIGDIR_REL = '$ENV{CMAKECONFIGDIR_REL}'; --our \$VERSION = '$ENV{VERSION}'; --our \@LDLIBS = -+our \@EXPORT = qw( -+_____ -+ -+foreach my $k (@absolutes) { -+ print " \$$k\n"; -+} -+foreach my $pair (@subdirs) { -+ my ($var, $subdir_vars) = @$pair; -+ foreach my $k (@$subdir_vars) { -+ my $k2 = "${k}_REL_${var}"; -+ print " \$$k \$$k2\n"; -+ } -+} -+ -+print <<_____; -+ \$VERSION \@LDLIBS -+); -+ -+_____ -+ -+foreach my $k (@absolutes) { -+ print "our \$$k" . ' ' x (27 - length($k)) . "= '$ENV{$k}';\n"; -+} -+foreach my $pair (@subdirs) { -+ my ($var, $subdir_vars) = @$pair; -+ foreach my $k (@$subdir_vars) { -+ my $k2 = "${k}_REL_${var}"; -+ print "our \$$k" . ' ' x (27 - length($k)) . "= '$ENV{$k}';\n"; -+ print "our \$$k2" . ' ' x (27 - length($k2)) . "= '$ENV{$k2}';\n"; -+ } -+} -+ -+print <<_____; -+our \$VERSION = '$ENV{VERSION}'; -+our \@LDLIBS = - # Unix and Windows use space separation, VMS uses comma separation - split(/ +| *, */, '$ENV{LDLIBS}'); - - -From 1c437b5704c9ee5f667bc2b11e5fdf176dfb714f Mon Sep 17 00:00:00 2001 -From: Richard Levitte <levitte@openssl.org> -Date: Thu, 20 Jun 2024 14:33:15 +0200 -Subject: [PATCH] Adapt all the exporter files to the new vars from - util/mkinstallvars.pl - -With this, the pkg-config files take better advantage of relative directory -values. - -Fixes #24298 - -Reviewed-by: Neil Horman <nhorman@openssl.org> -Reviewed-by: Tomas Mraz <tomas@openssl.org> -(Merged from https://github.com/openssl/openssl/pull/24687) - -(cherry picked from commit 30dc37d798a0428fd477d3763086e7e97b3d596f) ---- - exporters/cmake/OpenSSLConfig.cmake.in | 7 ++++--- - exporters/pkg-config/libcrypto.pc.in | 12 ++++++++---- - exporters/pkg-config/libssl.pc.in | 8 ++++++-- - exporters/pkg-config/openssl.pc.in | 8 ++++++-- - 4 files changed, 24 insertions(+), 11 deletions(-) - -diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in -index 2d2321931de1d..06f796158b2fa 100644 ---- a/exporters/cmake/OpenSSLConfig.cmake.in -+++ b/exporters/cmake/OpenSSLConfig.cmake.in -@@ -89,9 +89,10 @@ unset(_ossl_undefined_targets) - # Set up the import path, so all other import paths are made relative this file - get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH) - {- -- # For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL, have CMake -- # out the parent directory. -- my $d = unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL); -+ # For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR relative to -+ # $OpenSSL::safe::installdata::PREFIX, have CMake figure out the parent directory. -+ my $d = join('/', unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX), -+ unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR)); - $OUT = ''; - $OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n" - foreach (split '/', $d); -diff --git a/exporters/pkg-config/libcrypto.pc.in b/exporters/pkg-config/libcrypto.pc.in -index 14ed339f3c3a0..fbc8ea4c79b06 100644 ---- a/exporters/pkg-config/libcrypto.pc.in -+++ b/exporters/pkg-config/libcrypto.pc.in -@@ -1,7 +1,11 @@ --libdir={- $OpenSSL::safe::installdata::LIBDIR -} --includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -} --enginesdir={- $OpenSSL::safe::installdata::ENGINESDIR -} --modulesdir={- $OpenSSL::safe::installdata::MODULESDIR -} -+prefix={- $OpenSSL::safe::installdata::PREFIX -} -+exec_prefix=${prefix} -+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ : $OpenSSL::safe::installdata::libdir -} -+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -} -+enginesdir=${libdir}/{- $OpenSSL::safe::installdata::ENGINESDIR_REL_LIBDIR -} -+modulesdir=${libdir}/{- $OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR -} - - Name: OpenSSL-libcrypto - Description: OpenSSL cryptography library -diff --git a/exporters/pkg-config/libssl.pc.in b/exporters/pkg-config/libssl.pc.in -index a7828b3cc6a49..963538807bb2b 100644 ---- a/exporters/pkg-config/libssl.pc.in -+++ b/exporters/pkg-config/libssl.pc.in -@@ -1,5 +1,9 @@ --libdir={- $OpenSSL::safe::installdata::LIBDIR -} --includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -} -+prefix={- $OpenSSL::safe::installdata::PREFIX -} -+exec_prefix=${prefix} -+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ : $OpenSSL::safe::installdata::libdir -} -+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -} - - Name: OpenSSL-libssl - Description: Secure Sockets Layer and cryptography libraries -diff --git a/exporters/pkg-config/openssl.pc.in b/exporters/pkg-config/openssl.pc.in -index dbb77aa39add2..225bef9e2384d 100644 ---- a/exporters/pkg-config/openssl.pc.in -+++ b/exporters/pkg-config/openssl.pc.in -@@ -1,5 +1,9 @@ --libdir={- $OpenSSL::safe::installdata::LIBDIR -} --includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -} -+prefix={- $OpenSSL::safe::installdata::PREFIX -} -+exec_prefix=${prefix} -+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX -+ : $OpenSSL::safe::installdata::libdir -} -+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -} - - Name: OpenSSL - Description: Secure Sockets Layer and cryptography libraries and tools diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch deleted file mode 100644 index b915b963509a..000000000000 --- a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/openssl/openssl/pull/25018 -https://bugs.gentoo.org/936793 - -From b7bd618fb12728b4a85b9159af95ca40a817674d Mon Sep 17 00:00:00 2001 -From: Richard Levitte <levitte@openssl.org> -Date: Sun, 28 Jul 2024 10:47:08 +0200 -Subject: [PATCH] fix: util/mkinstallvars.pl mistreated LDLIBS on Unix (and - Windows) - -Don't do comma separation on those platforms. - -Fixes #24986 ---- - util/mkinstallvars.pl | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl -index 5fadb708e1b77..e2b7d9d08321f 100644 ---- a/util/mkinstallvars.pl -+++ b/util/mkinstallvars.pl -@@ -124,7 +124,9 @@ package OpenSSL::safe::installdata; - our \$VERSION = '$ENV{VERSION}'; - our \@LDLIBS = - # Unix and Windows use space separation, VMS uses comma separation -- split(/ +| *, */, '$ENV{LDLIBS}'); -+ \$^O eq 'VMS' -+ ? split(/ *, */, '$ENV{LDLIBS}') -+ : split(/ +/, '$ENV{LDLIBS}'); - - 1; - _____ diff --git a/dev-libs/openssl/files/openssl-3.3.1-riscv.patch b/dev-libs/openssl/files/openssl-3.3.1-riscv.patch deleted file mode 100644 index 90cad6d92a00..000000000000 --- a/dev-libs/openssl/files/openssl-3.3.1-riscv.patch +++ /dev/null @@ -1,96 +0,0 @@ -# https://bugs.gentoo.org/936311 -# Taken from https://github.com/openssl/openssl/pull/24486 - -From b1dd4a8005cf172053d986c0dd85fd104f005307 Mon Sep 17 00:00:00 2001 -From: Hongren Zheng <i@zenithal.me> -Date: Fri, 24 May 2024 14:12:47 +0800 -Subject: [PATCH] riscv: Fix cpuid_obj asm checks for sm4/sm3 - -Similar to #22881 / #23752 ---- - crypto/sm3/sm3_local.h | 2 +- - include/crypto/sm4_platform.h | 2 +- - providers/implementations/ciphers/cipher_sm4_ccm_hw.c | 2 +- - providers/implementations/ciphers/cipher_sm4_gcm_hw.c | 2 +- - providers/implementations/ciphers/cipher_sm4_hw.c | 2 +- - providers/implementations/ciphers/cipher_sm4_xts_hw.c | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h -index d2845f9678967..a467cc98eb13e 100644 ---- a/crypto/sm3/sm3_local.h -+++ b/crypto/sm3/sm3_local.h -@@ -39,7 +39,7 @@ - # define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3) - void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num); - # endif --# if defined(__riscv) && __riscv_xlen == 64 -+# if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - # include "crypto/riscv_arch.h" - # define HWSM3_CAPABLE 1 - void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num); -diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h -index 928dc17ff0838..4d70d291450a1 100644 ---- a/include/crypto/sm4_platform.h -+++ b/include/crypto/sm4_platform.h -@@ -38,7 +38,7 @@ static inline int vpsm4_ex_capable(void) - # define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt - # define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt - # define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks --# elif defined(__riscv) && __riscv_xlen == 64 -+# elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - /* RV64 support */ - # include "riscv_arch.h" - /* Zvksed extension (vector crypto SM4). */ -diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c -index 34f0e751e007d..293bb69d64272 100644 ---- a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c -+++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c -@@ -59,7 +59,7 @@ static const PROV_CCM_HW ccm_sm4 = { - ossl_ccm_generic_gettag - }; - --#if defined(__riscv) && __riscv_xlen == 64 -+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - # include "cipher_sm4_ccm_hw_rv64i.inc" - #else - const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keybits) -diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c -index 06ca450782ff2..e3b4e9f588807 100644 ---- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c -+++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c -@@ -89,7 +89,7 @@ static const PROV_GCM_HW sm4_gcm = { - ossl_gcm_one_shot - }; - --#if defined(__riscv) && __riscv_xlen == 64 -+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - # include "cipher_sm4_gcm_hw_rv64i.inc" - #else - const PROV_GCM_HW *ossl_prov_sm4_hw_gcm(size_t keybits) -diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c -index c4f2f97cccd8d..70dc66ffae233 100644 ---- a/providers/implementations/ciphers/cipher_sm4_hw.c -+++ b/providers/implementations/ciphers/cipher_sm4_hw.c -@@ -134,7 +134,7 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_##mode(size_t keybits) \ - return &sm4_##mode; \ - } - --#if defined(__riscv) && __riscv_xlen == 64 -+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - # include "cipher_sm4_hw_rv64i.inc" - #else - /* The generic case */ -diff --git a/providers/implementations/ciphers/cipher_sm4_xts_hw.c b/providers/implementations/ciphers/cipher_sm4_xts_hw.c -index 6cf58e851f5d4..423598317d217 100644 ---- a/providers/implementations/ciphers/cipher_sm4_xts_hw.c -+++ b/providers/implementations/ciphers/cipher_sm4_xts_hw.c -@@ -89,7 +89,7 @@ static const PROV_CIPHER_HW sm4_generic_xts = { - cipher_hw_sm4_xts_copyctx - }; - --#if defined(__riscv) && __riscv_xlen == 64 -+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64 - # include "cipher_sm4_xts_hw_rv64i.inc" - #else - const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_xts(size_t keybits) diff --git a/dev-libs/sleef/Manifest b/dev-libs/sleef/Manifest index 7685207c0883..1ad405f69479 100644 --- a/dev-libs/sleef/Manifest +++ b/dev-libs/sleef/Manifest @@ -1,6 +1,3 @@ -AUX sleef-3.5.1-gentoo.patch 1261 BLAKE2B cef8f55c1e24e0366636965a7838caf2f1f204dd6bf76b3521bf4e8f2819af461394a743417999245a3cdcd204069914b03285234f073bdbd45852dc6d2b62ba SHA512 2dc7a8f1dd4e061df24ddc0061ca9e6b1fb06d6660a95c9a9bf33b90c419cc36fb2ab7c1c9aeb40cb019f459a7552aa3aae8e9189d7d0c5caf21fbc4390c49eb -AUX sleef-3.5.1-mpfr42.patch 903 BLAKE2B 1726946ab5ea9b7e1c3756694d6cbbf0fd182aa0c49423c037b840f11f050f780914981a0af198d4f82531c73cbabd20655be1da5a4aab6c184d9c43e96ac337 SHA512 7ac5ee743a0a622ca7b8b37d0c2b8a5a22fe9eb3f6ca14240f457de26c6bec6326d127dbbebfe8cb3dd20702968db2f0193cabcb3f23b08e225a8085da08f510 -AUX sleef-3.5.1-riscv.patch 529 BLAKE2B ca2669ccae99ca413eb00082efea611186f9d620b6e6918f967597b0c54b3e9439c4f3687105babda5cf6072e739991548ccaab2b51960e7043f00e791c78728 SHA512 066c7ac1d53b517c5ba16216fde80320e3adf6297eb90d747f8d91cc115a021682f75c69f1d8fe1034b4f35ef9a723000c2848721020890e0ed74bfea944a8cc AUX sleef-3.6.1-musl.patch 562 BLAKE2B 65b8f8182b3291b32b68f5ece742cb04fb4e302a4772337c5c1685fad7536d3b43a65b4f15d4e65d4e747008d96e29a24ec9b3fe17322f16b9c1cd24e29257dd SHA512 95c78ca346ad9b4bc7626778c648d815e8fcf996cdba3d93d1c04a370f4b2f3f5bb65162783bdeffbf02a018298c310be2a929691eb9ed2999b973910ef6a766 DIST sleef-3.7.tar.gz 1610462 BLAKE2B 25d7cc2190108d1fafd756e5e38952411f553f01775d58d89dffebf34e873dc2067bbd21bab5f01c059943ef213e09aa61c58a2610e4545d8fd17e59b9ee428b SHA512 0f42c4132523f87c9e214bd9eb965e77b84c80e9a63588ed854796fccd2b9affb849a74e5f95f7b0161ba6281ca7ff509d510b42950dc38a6b8175cf6745ab07 EBUILD sleef-3.7-r1.ebuild 764 BLAKE2B 055762d85af68f01730cd209a7bcfaeee919af8fa1cc90eb08e68a380fb2dfee31ff5331d303fd5633d385b521fe979e1cf1ea0e729d61ebe70b2dcb55d73b50 SHA512 5a36259f2c2fc4d6167bf255ac00f76da7a15f48b09006f47ad3259da1ba1be3977d95159f6f8b7e90d86047b7eac45bfb32beefbd7160c1f54de68fb3b40eab diff --git a/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch b/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch deleted file mode 100644 index 2246f74151fd..000000000000 --- a/dev-libs/sleef/files/sleef-3.5.1-gentoo.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/dft-tester/CMakeLists.txt 2022-05-11 21:48:47.011990780 +0200 -+++ b/src/dft-tester/CMakeLists.txt 2022-05-11 21:49:07.424697074 +0200 -@@ -186,15 +186,7 @@ - - # Test roundtriptest2ddp - add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_2_2 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 2 2 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_4_4 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 4 4 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_8_8 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 8 8 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_10_10 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 10 10 2) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DDP}_5_15 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DDP}> 5 15 2) - - # Test roundtriptest2dsp - add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_2_2 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 2 2 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_4_4 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 4 4 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_8_8 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 8 8 10) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_10_10 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 10 10 2) -- add_test_dft(${TARGET_ROUNDTRIPTEST2DSP}_5_15 $<TARGET_FILE:${TARGET_ROUNDTRIPTEST2DSP}> 5 15 2) - endif(LIBFFTW3 AND NOT DISABLE_FFTW) diff --git a/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch b/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch deleted file mode 100644 index 0ae5706974f2..000000000000 --- a/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/libm-tester/testerutil.h 2023-04-12 22:07:52.400469592 +0200 -+++ b/src/libm-tester/testerutil.h 2023-04-12 22:08:03.404312574 +0200 -@@ -90,7 +90,5 @@ - double countULPsp(float d, mpfr_t c); - double countULP2sp(float d, mpfr_t c); - --void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd); --void mpfr_cospi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd); - void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd); - #endif ---- a/src/libm-tester/testerutil.c 2023-04-12 22:07:55.045431845 +0200 -+++ b/src/libm-tester/testerutil.c 2023-04-12 22:08:23.275029908 +0200 -@@ -289,7 +289,7 @@ - } - - // -- -+#if 0 - void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) { - mpfr_t frpi, frd; - mpfr_inits(frpi, frd, NULL); -@@ -315,7 +315,7 @@ - - mpfr_clears(frpi, frd, NULL); - } -- -+#endif - void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) { - int s; - mpfr_lgamma(ret, &s, arg, rnd); diff --git a/dev-libs/sleef/files/sleef-3.5.1-riscv.patch b/dev-libs/sleef/files/sleef-3.5.1-riscv.patch deleted file mode 100644 index bb5ad68416f3..000000000000 --- a/dev-libs/sleef/files/sleef-3.5.1-riscv.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/arch/helperpurec_scalar.h 2023-04-07 19:54:14.823254936 +0200 -+++ b/src/arch/helperpurec_scalar.h 2023-04-07 19:54:29.684024763 +0200 -@@ -54,7 +54,7 @@ - #define ENABLE_FMA_SP - //@#define ENABLE_FMA_SP - --#if defined(__AVX2__) || defined(__aarch64__) || defined(__arm__) || defined(__powerpc64__) || defined(__zarch__) -+#if defined(__AVX2__) || defined(__aarch64__) || defined(__arm__) || defined(__powerpc64__) || defined(__zarch__) || defined(__riscv) - #ifndef FP_FAST_FMA - #define FP_FAST_FMA - //@#define FP_FAST_FMA diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index e36ebde25550..8a566adbbb60 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,8 +1,6 @@ AUX xmlsec-1.3.0-optimisation.patch 583 BLAKE2B 9035391762150ffa82eef10bc1ba1bde08b04e9e968bf850673dae3e27650e85516e1da4dc3385cd7aafde4cab6270a84e5205a149bcb19dbbdca5ffae678ac8 SHA512 fac70c0e0761d1d8016fb597ed4c139628bfab9d3600eeff17c16b9414732076bea65bee5c778481ecf944053319e030dfb4a455c6d51ba3e758007c36f72323 -DIST xmlsec1-1.3.4.tar.gz 2435656 BLAKE2B b398f970e5b201971419b537125e9a7430c8d7c1c57e193b2592ee3f01ce797993607a210e87ad44e99bc0ef49ac4c350492268a3ac3bedbb81d937d99837468 SHA512 959a97ed7d7cbdc3e5ef037b2cb4f05bda299274c09ed3dfe24f7203d97e3dfc13bf480e15a2d15bcc7893569d341204884de58cc9b462b6c29306b67672e9c7 DIST xmlsec1-1.3.5.tar.gz 2451506 BLAKE2B 4a265793a7499c4f6421c6d60552bd2ea18f06e3c28435520188c0a7c36a4de8aa40f20658949b93d826a8f6fb20bd8f2be1a78e6d103ae573e6353a2a5380a7 SHA512 69e9f18e2bc6b1b9acaf475a534a666965a561eec6a5a152185d264a4110d97d233af302153577a414e232a8880c6afc66b563118d889e670204d93819fcfdb5 DIST xmlsec1-1.3.6.tar.gz 2453984 BLAKE2B 217817ef0f7003247b7173a6581ba6428e623ff4e464b4ea08bd93d07c0aaba8ee379cbdd6309e3c2c6f07f5022fe55a51dc1afc001525bf219eff9f06ff5aad SHA512 f38ccc7af0026973a94b1b6f95accd70a2a2c4398985a0002c66d7b43bff6d6bcfb09ae62046cbdac82a0890622aead2df710cb0ab373c3bdf6159797613cdaa -EBUILD xmlsec-1.3.4.ebuild 1920 BLAKE2B 12ad241a4d30da2fe401c4c9283d9d14d0ff6b08a1f40336dee6ca0d1d847725f4b0ee0ead2f587a12372d68d652a7b150008930c465b48cf637df73759be77d SHA512 3817cc030b91feea89a4980b865d7f8d7f19908309ca487faf997a4cd2e35ff26c20921e1a8c292a406a6dbb5a04d018c33cc2755836c72688b8fd3e93841e99 EBUILD xmlsec-1.3.5.ebuild 1920 BLAKE2B 12ad241a4d30da2fe401c4c9283d9d14d0ff6b08a1f40336dee6ca0d1d847725f4b0ee0ead2f587a12372d68d652a7b150008930c465b48cf637df73759be77d SHA512 3817cc030b91feea89a4980b865d7f8d7f19908309ca487faf997a4cd2e35ff26c20921e1a8c292a406a6dbb5a04d018c33cc2755836c72688b8fd3e93841e99 EBUILD xmlsec-1.3.6.ebuild 1926 BLAKE2B 1ec6abea934ee206d6606f398861285930b36229602fc586b091e890fe16ccf2acedb192fa00d37e3aa8cadbf8d0ec194b9a8286155d7f13ab7d7721ed585678 SHA512 db8c8d9a87c37c64c2de280071e53ee0ec448cf31019576845a62f0a6185abd4c6273dfc406e0c6268708ae061b473cbbeaa0e41d13257e3d039e8611571405d MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d diff --git a/dev-libs/xmlsec/xmlsec-1.3.4.ebuild b/dev-libs/xmlsec/xmlsec-1.3.4.ebuild deleted file mode 100644 index e844f37da9b6..000000000000 --- a/dev-libs/xmlsec/xmlsec-1.3.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" -HOMEPAGE="https://www.aleksey.com/xmlsec" -SRC_URI=" - https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz - https://www.aleksey.com/xmlsec/download/older-releases/${PN}1-${PV}.tar.gz -" -S="${WORKDIR}/${PN}1-${PV}" - -LICENSE="MIT" -# Upstream consider major version bumps to be changes in either X or Y in X.Y.Z -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="doc gcrypt gnutls http nss +openssl static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( gnutls nss openssl ) -" - -RDEPEND=" - >=dev-libs/libxml2-2.7.4 - >=dev-libs/libxslt-1.0.20 - dev-libs/libltdl - gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= ) - gnutls? ( >=net-libs/gnutls-3.6.13:= ) - nss? ( - >=dev-libs/nspr-4.4.1 - >=dev-libs/nss-3.9 - ) - openssl? ( dev-libs/openssl:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( - nss? ( - >=dev-libs/nss-3.9[utils] - ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-optimisation.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable doc docs) - $(use_enable static-libs static) - $(use_with gcrypt) - $(use_with gnutls) - $(use_with nss nspr) - $(use_with nss) - $(use_with openssl) - - --disable-werror - --enable-mans - --enable-pkgconfig - - --enable-concatkdf - --enable-pbkdf2 - --enable-ec - --enable-dh - --enable-sha3 - - --enable-files - $(use_enable http) - --disable-ftp - ) - - # Bash because of bug #721128 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_test() { - # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC - TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} |