From 4b3ae28dfb580ffd55716a3a4c0db6dd8ba7cfba Mon Sep 17 00:00:00 2001 From: Daniel Zatovic Date: Wed, 5 Nov 2025 09:52:04 +0100 Subject: [PATCH] virtual/zlib: Add from Gentoo Gentoo is moving the zlib dependency from sys-libs/zlib to virtual/zlib to allow different zlib implementation (like zlib-ng). We need to pull this virtual dependency because erofs-utils depends on it. Signed-off-by: Daniel Zatovic --- .../workflows/portage-stable-packages-list | 1 + .../portage-stable/virtual/zlib/metadata.xml | 11 +++++++++ .../virtual/zlib/zlib-1.3.1-r1.ebuild | 18 +++++++++++++++ .../virtual/zlib/zlib-1.3.1.ebuild | 23 +++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/zlib/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 7e64e8084f..00d4f95d24 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -750,6 +750,7 @@ virtual/service-manager virtual/ssh virtual/tmpfiles virtual/udev +virtual/zlib x11-drivers/nvidia-drivers diff --git a/sdk_container/src/third_party/portage-stable/virtual/zlib/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/zlib/metadata.xml new file mode 100644 index 0000000000..e2171ff983 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/zlib/metadata.xml @@ -0,0 +1,11 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + include the minizip library for quick and dirty zip extraction + + diff --git a/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1-r1.ebuild new file mode 100644 index 0000000000..1ca59a8c38 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1-r1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-build + +DESCRIPTION="Virtual for libz.so providers" +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="static-libs" + +RDEPEND=" + || ( + >=sys-libs/zlib-1.3.1[${MULTILIB_USEDEP},static-libs?] + sys-libs/zlib-ng[${MULTILIB_USEDEP},compat,static-libs(-)?] + ) +" diff --git a/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1.ebuild new file mode 100644 index 0000000000..75bff12184 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/zlib/zlib-1.3.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-build + +DESCRIPTION="Virtual for libz.so providers" +SLOT="0/1" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="minizip static-libs" + +RDEPEND=" + || ( + >=sys-libs/zlib-1.3.1[${MULTILIB_USEDEP},minizip?,static-libs?] + ( + sys-libs/zlib-ng[${MULTILIB_USEDEP},compat,static-libs(-)?] + minizip? ( + sys-libs/minizip-ng[${MULTILIB_USEDEP},compat,static-libs(-)?] + ) + ) + ) +"