From 9346d46d1a9e0399ca3a4d3eb40689d0daa58ebc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Oct 2023 03:52:46 +0100 Subject: gentoo auto-resync : 20:10:2023 - 03:52:46 --- sys-libs/Manifest.gz | Bin 14752 -> 14754 bytes sys-libs/zlib-ng/Manifest | 7 +- sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch | 35 --------- sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild | 78 -------------------- sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild | 90 ----------------------- sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild | 86 ++++++++++++++++++++++ 6 files changed, 88 insertions(+), 208 deletions(-) delete mode 100644 sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch delete mode 100644 sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild delete mode 100644 sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild create mode 100644 sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index dcf33a6389d6..931b0593b770 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest index bd40b89846ae..ece05a7b2416 100644 --- a/sys-libs/zlib-ng/Manifest +++ b/sys-libs/zlib-ng/Manifest @@ -1,8 +1,5 @@ -AUX zlib-ng-2.1.2-cmake.patch 1338 BLAKE2B a082171657f55f792ffba58e05a80df50dcc3dcd145844b5fde79e25e3122666bba5b1a2d2a3fbb6780f02d3fbdfc843d3a8112266e0508c3c890464a7c5c5ac SHA512 c9b317df0c25250ee04df360a4f6095f7476bb3a81d80f10db960003a33aecb843432549395095bb8c904644b40c16477ad51b1fb8842198a5035fdab608947c -DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B 89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988 -DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403 SHA512 2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465 DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9 SHA512 cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e -EBUILD zlib-ng-2.0.7.ebuild 2133 BLAKE2B 9c74f3a169705f9cc1ed010093cfbc316a4209541384534bc51f95435e8242d7e742978ab87d0f2d5ae6d6eb2fe5a00f63364bfd16feb9b840b98b78c03f6cf3 SHA512 c0c0939ad7e58f55607ac01f7186314a1bc7fee8b37c0589e83d1227e5d136c33cfcdd52e82de9fc93f368a6299ecf98778a2d266ceccbe3d26ce2787d6405f9 -EBUILD zlib-ng-2.1.2-r1.ebuild 2475 BLAKE2B 541a5a506b365ef371298468f01b2a836c945cba840d9af3567915c0dc9bc984c1effe2e0820b0258bc31daa64f9d3fedabca7f346f3e287ed2a296848f0eb99 SHA512 38adf92731d5c70595b7b2c1154441bd54c746b38ce9059ae8a1453759108d8fe1ec7e1627892660f383aa6aa6ea380ac1f719660924f489f9ad87d6c1abe39b +DIST zlib-ng-2.1.4.tar.gz 2408377 BLAKE2B 0b5aff9671b43bda2adfc84987c6baa108fa444978d465f12516f13f32b88e6bbe52f7d3e48ff93c720229842062fe71c38ff7c1e7591e18fc7351c943fd2a6b SHA512 5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2 EBUILD zlib-ng-2.1.3.ebuild 2421 BLAKE2B eba6881a1a0e5ab68afbcdde3a52e6f277e957b2339ba73c4c988f17aa0fd6ac6a31e217d8033ea4f22167e5737ffbad4d6cdf490d793191fcc687d065dc0838 SHA512 5ac14e86cfb25ef7a1df59f099c503811a764a44a57cf2f58c567d637f55ffbd6fcda17ba140a035a137582286d0f82fa75b6f9fb4e7d9eefcab79fdee0e9bdf +EBUILD zlib-ng-2.1.4.ebuild 2421 BLAKE2B eba6881a1a0e5ab68afbcdde3a52e6f277e957b2339ba73c4c988f17aa0fd6ac6a31e217d8033ea4f22167e5737ffbad4d6cdf490d793191fcc687d065dc0838 SHA512 5ac14e86cfb25ef7a1df59f099c503811a764a44a57cf2f58c567d637f55ffbd6fcda17ba140a035a137582286d0f82fa75b6f9fb4e7d9eefcab79fdee0e9bdf MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e diff --git a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch deleted file mode 100644 index 8deb07a60515..000000000000 --- a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/zlib-ng/zlib-ng/issues/1515 -https://github.com/zlib-ng/zlib-ng/pull/1519 -https://github.com/zlib-ng/zlib-ng/commit/39136c20716a94188c1d041b9656315371d35a47 - -From 39136c20716a94188c1d041b9656315371d35a47 Mon Sep 17 00:00:00 2001 -From: "Mika T. Lindqvist" -Date: Sun, 11 Jun 2023 18:38:12 +0300 -Subject: [PATCH] Try to find system copy of googletest before trying to - download it. * Don't use system copy if memory sanitizer is enabled - ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -111,8 +111,6 @@ if(WITH_BENCHMARKS) - endif() - - if(WITH_GTEST) -- include(FetchContent) -- - # Google test requires at least C++11 - set(CMAKE_CXX_STANDARD 11) - -@@ -125,9 +123,13 @@ if(WITH_GTEST) - # Must set include and compile options before fetching googletest - include_directories($ENV{LLVM_BUILD_DIR}/include $ENV{LLVM_BUILD_DIR}/include/c++/v1) - add_compile_options(-stdlib=libc++ -g) -+ elseif(NOT TARGET GTest::GTest) -+ find_package(GTest) - endif() - - if(NOT TARGET GTest::GTest) -+ include(FetchContent) -+ - # Prevent overriding the parent project's compiler/linker settings for Windows - set(gtest_force_shared_crt ON CACHE BOOL - "Use shared (DLL) run-time lib even when Google Test is built as static lib." FORCE) diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild deleted file mode 100644 index 641a623a64aa..000000000000 --- a/sys-libs/zlib-ng/zlib-ng-2.0.7.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports, -# as they copied this practice from sys-libs/zlib upstream. - -inherit cmake - -DESCRIPTION="Fork of the zlib data compression library" -HOMEPAGE="https://github.com/zlib-ng/zlib-ng" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - -CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} ) -IUSE="compat ${CPU_USE[@]} test" - -RESTRICT="!test? ( test )" - -RDEPEND="compat? ( !sys-libs/zlib )" - -src_configure() { - local mycmakeargs=( - -DZLIB_COMPAT="$(usex compat)" - -DZLIB_ENABLE_TESTS="$(usex test)" - # Unaligned access is controversial and undefined behaviour - # Let's keep it off for now - # https://github.com/gentoo/gentoo/pull/17167 - -DWITH_UNALIGNED="OFF" - ) - - # The intrinsics options are all defined conditionally, so we need - # to enable them on/off per-arch here for now. - if use amd64 || use x86 ; then - mycmakeargs+=( - -DWITH_AVX2=$(usex cpu_flags_x86_avx2) - -DWITH_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3) - -DWITH_SSE4=$(usex cpu_flags_x86_sse4a) - -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul) - ) - fi - - if use arm || use arm64 ; then - mycmakeargs+=( - -DWITH_ACLE=$(usex cpu_flags_arm_crc32) - -DWITH_NEON=$(usex cpu_flags_arm_neon) - ) - fi - - if use ppc || use ppc64 ; then - # The POWER8 support is VSX which was introduced - # VSX2 was introduced with POWER8, so use that as a proxy for it - mycmakeargs+=( - -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2) - ) - fi - - # TODO: There's no s390x USE_EXPAND yet - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use compat ; then - ewarn "zlib-ng is experimental and replacing the system zlib is dangerous" - ewarn "Please be careful!" - ewarn - ewarn "The following link explains the guarantees (and what is NOT guaranteed):" - ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md" - fi -} diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild deleted file mode 100644 index 25a52ed3352c..000000000000 --- a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports, -# as they copied this practice from sys-libs/zlib upstream. - -inherit cmake-multilib - -DESCRIPTION="Fork of the zlib data compression library" -HOMEPAGE="https://github.com/zlib-ng/zlib-ng" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - -CPU_USE=( - x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul} - arm_{crc32,neon} - ppc_{altivec,vsx2,vsx3} -) -IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test" - -RESTRICT="!test? ( test )" - -RDEPEND="compat? ( !sys-libs/zlib )" - -PATCHES=( - "${FILESDIR}"/zlib-ng-2.1.2-cmake.patch -) - -multilib_src_configure() { - local mycmakeargs=( - -DZLIB_COMPAT=$(usex compat) - -DZLIB_ENABLE_TESTS=$(usex test) - -DWITH_GTEST=$(usex test) - - # Unaligned access is controversial and undefined behaviour - # Let's keep it off for now - # https://github.com/gentoo/gentoo/pull/17167 - -DWITH_UNALIGNED=OFF - ) - - # The intrinsics options are all defined conditionally, so we need - # to enable them on/off per-arch here for now. - # TODO: There's no s390x USE_EXPAND yet - if use amd64 || use x86 ; then - mycmakeargs+=( - -DWITH_AVX2=$(usex cpu_flags_x86_avx2) - -DWITH_AVX512=$(usex cpu_flags_x86_avx512f) - -DWITH_AVX512VNNI=OFF # TODO, see bug #908556 - -DWITH_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3) - -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2) - -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul) - -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556 - ) - fi - - if use arm || use arm64 ; then - mycmakeargs+=( - -DWITH_ACLE=$(usex cpu_flags_arm_crc32) - -DWITH_NEON=$(usex cpu_flags_arm_neon) - ) - fi - - if use ppc || use ppc64 ; then - # The POWER8 support is VSX which was introduced - # VSX2 was introduced with POWER8, so use that as a proxy for it - mycmakeargs+=( - -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec) - -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2) - -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3) - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - if use compat ; then - ewarn "zlib-ng is experimental and replacing the system zlib is dangerous" - ewarn "Please be careful!" - ewarn - ewarn "The following link explains the guarantees (and what is NOT guaranteed):" - ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md" - fi -} diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild new file mode 100644 index 000000000000..cfef9b1cc843 --- /dev/null +++ b/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Worth keeping an eye on 'develop' branch upstream for possible backports, +# as they copied this practice from sys-libs/zlib upstream. + +inherit cmake-multilib + +DESCRIPTION="Fork of the zlib data compression library" +HOMEPAGE="https://github.com/zlib-ng/zlib-ng" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +CPU_USE=( + x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul} + arm_{crc32,neon} + ppc_{altivec,vsx2,vsx3} +) +IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test" + +RESTRICT="!test? ( test )" + +RDEPEND="compat? ( !sys-libs/zlib )" + +multilib_src_configure() { + local mycmakeargs=( + -DZLIB_COMPAT=$(usex compat) + -DZLIB_ENABLE_TESTS=$(usex test) + -DWITH_GTEST=$(usex test) + + # Unaligned access is controversial and undefined behaviour + # Let's keep it off for now + # https://github.com/gentoo/gentoo/pull/17167 + -DWITH_UNALIGNED=OFF + ) + + # The intrinsics options are all defined conditionally, so we need + # to enable them on/off per-arch here for now. + # TODO: There's no s390x USE_EXPAND yet + if use amd64 || use x86 ; then + mycmakeargs+=( + -DWITH_AVX2=$(usex cpu_flags_x86_avx2) + -DWITH_AVX512=$(usex cpu_flags_x86_avx512f) + -DWITH_AVX512VNNI=OFF # TODO, see bug #908556 + -DWITH_SSE2=$(usex cpu_flags_x86_sse2) + -DWITH_SSSE3=$(usex cpu_flags_x86_ssse3) + -DWITH_SSE42=$(usex cpu_flags_x86_sse4_2) + -DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul) + -DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556 + ) + fi + + if use arm || use arm64 ; then + mycmakeargs+=( + -DWITH_ACLE=$(usex cpu_flags_arm_crc32) + -DWITH_NEON=$(usex cpu_flags_arm_neon) + ) + fi + + if use ppc || use ppc64 ; then + # The POWER8 support is VSX which was introduced + # VSX2 was introduced with POWER8, so use that as a proxy for it + mycmakeargs+=( + -DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec) + -DWITH_POWER8=$(usex cpu_flags_ppc_vsx2) + -DWITH_POWER9=$(usex cpu_flags_ppc_vsx3) + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + if use compat ; then + ewarn "zlib-ng is experimental and replacing the system zlib is dangerous" + ewarn "Please be careful!" + ewarn + ewarn "The following link explains the guarantees (and what is NOT guaranteed):" + ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md" + fi +} -- cgit v1.2.3