Adding metadata

7 files changed, 397 insertions, 178 deletions

diff --git a/sys-libs/glibc/glibc-2.42-r5.ebuild b/sys-libs/glibc/glibc-2.42-r5.ebuild
index eaf167e09613..c0e2b76019eb 100644
--- a/sys-libs/glibc/glibc-2.42-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.42-r5.ebuild
@@ -1510,7 +1510,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so
+			x86     /lib/ld.so.1
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
@@ -1549,6 +1549,20 @@ glibc_do_src_install() {
 		done
 	fi
 
+	if is_hurd && has x86 $(get_install_abis) ; then
+		# On ix86, glibc and (unpatched) gcc disagree about the proper location for the dynamic loader.
+		# Which is maximally stupid since this one information is hardcoded into every single
+		# binary...
+
+		# First, let's check for sanity
+		if [[ -f "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so" ]] ; then
+			die "Somehow your hurd glibc installed a literal ld.so ... this should not happen."
+		fi
+
+		# Then make a compatibility symlink.
+		dosym ld.so.1 "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so"
+	fi
+
 	# With devpts under Linux mounted properly, we do not need the pt_chown
 	# binary to be setuid.  This is because the default owners/perms will be
 	# exactly what we want.
diff --git a/sys-libs/glibc/glibc-2.43.ebuild b/sys-libs/glibc/glibc-2.43.ebuild
index 6306758d19d3..43c6ac5e29ac 100644
--- a/sys-libs/glibc/glibc-2.43.ebuild
+++ b/sys-libs/glibc/glibc-2.43.ebuild
@@ -1539,7 +1539,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so
+			x86     /lib/ld.so.1
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
@@ -1578,6 +1578,20 @@ glibc_do_src_install() {
 		done
 	fi
 
+	if is_hurd && has x86 $(get_install_abis) ; then
+		# On ix86, glibc and (unpatched) gcc disagree about the proper location for the dynamic loader.
+		# Which is maximally stupid since this one information is hardcoded into every single
+		# binary...
+
+		# First, let's check for sanity
+		if [[ -f "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so" ]] ; then
+			die "Somehow your hurd glibc installed a literal ld.so ... this should not happen."
+		fi
+
+		# Then make a compatibility symlink.
+		dosym ld.so.1 "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so"
+	fi
+
 	# With devpts under Linux mounted properly, we do not need the pt_chown
 	# binary to be setuid.  This is because the default owners/perms will be
 	# exactly what we want.
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 3c8564559da5..2a072bed250e 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1539,7 +1539,7 @@ glibc_do_src_install() {
 		local ldso_abi_list=(
 			# x86
 			amd64   /lib64/ld-x86-64.so.1
-			x86     /lib/ld.so
+			x86     /lib/ld.so.1
 		)
 	fi
 	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
@@ -1578,6 +1578,20 @@ glibc_do_src_install() {
 		done
 	fi
 
+	if is_hurd && has x86 $(get_install_abis) ; then
+		# On ix86, glibc and (unpatched) gcc disagree about the proper location for the dynamic loader.
+		# Which is maximally stupid since this one information is hardcoded into every single
+		# binary...
+
+		# First, let's check for sanity
+		if [[ -f "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so" ]] ; then
+			die "Somehow your hurd glibc installed a literal ld.so ... this should not happen."
+		fi
+
+		# Then make a compatibility symlink.
+		dosym ld.so.1 "$(alt_prefix)/$(get_abi_LIBDIR x86)/ld.so"
+	fi
+
 	# With devpts under Linux mounted properly, we do not need the pt_chown
 	# binary to be setuid.  This is because the default owners/perms will be
 	# exactly what we want.
diff --git a/sys-libs/libnvidia-container/Manifest b/sys-libs/libnvidia-container/Manifest
index 8190a365a15d..61f24c69207e 100644
--- a/sys-libs/libnvidia-container/Manifest
+++ b/sys-libs/libnvidia-container/Manifest
@@ -1,3 +1,4 @@
 DIST libnvidia-container-1.18.0.tar.gz 1616152 BLAKE2B 86316e79209733be795b16570460fe2bd90f16b8279c990ae7c562495cc163ab2220f731205efd467884580aa04446a3ed266a2bd4a08bb5fa7ce09cf110f37c SHA512 230b6d3b0a29a54796cebdc212b4cb4b2249d8bb370e97778be88093b6d36153d1325a5755ef69d5b856cfc6b9a904e30d39466d86efd3369b2c838fa57cd7e9
 DIST libnvidia-container-1.18.1.tar.gz 1616164 BLAKE2B dd0243934475b13a24ed74f7dc1113ca657cc910c4d4ddb08d2d04f580191468673f572815212c99a5e7334380996adb38317349ced06c075583c54b5fb9c3a7 SHA512 0f8f7c2a7f61ee6396972c42b5ec7fa014ff93d66343c4d7064ff5aab0958a8e18e1cbbc64cdd2607ea0f60de8c7416b003081a34a109299dec8b0b63981360d
+DIST libnvidia-container-1.19.0.tar.gz 1617812 BLAKE2B 159074dc894c83f5fd9b23ece2c6c40eb1e540f1ed8a4af4c51400ae2745dbca49d5874a40a2abf24cb3dd61b60c83fcf0f63843145aaa42f47020e36513c89c SHA512 ca90b60cb7cc2762d95308276fa9e3ec5fb03970ea9bb51553854a9bc232feb69e31f23bbf7c2784c3d67d27f24d8de4f4157f762f8448c6f1d0545b4c1d938e
 DIST libnvidia-container-nvidia-modprobe-550.54.14.tar.gz 47147 BLAKE2B 7b334877d98d0c75d5750192dea868436938852443ced14e74e59076ed4d8be9e361cdefbe48295d87bb91ac4565152ec3f3233479b3da19bb8baf8e7ef53cd6 SHA512 279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193
diff --git a/sys-libs/libnvidia-container/files/libnvidia-container-1.19.0-fix-makefile.patch b/sys-libs/libnvidia-container/files/libnvidia-container-1.19.0-fix-makefile.patch
new file mode 100644
index 000000000000..4d4f43397da9
--- /dev/null
+++ b/sys-libs/libnvidia-container/files/libnvidia-container-1.19.0-fix-makefile.patch
@@ -0,0 +1,220 @@
+Base on The patch from Arch[1] but better suited to Gentoo needs.
+
+[1]: https://gitlab.archlinux.org/archlinux/packaging/packages/libnvidia-container/-/raw/84d2e8ae006a724744f664e6b40000569eab3b06/fix-makefile.patch
+diff --git a/Makefile b/Makefile
+index 1a5115c..5744615 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,18 +18,16 @@
+ ##### Global variables #####
+ 
+ WITH_NVCGO   ?= yes
+-WITH_LIBELF  ?= no
+-WITH_TIRPC   ?= no
++WITH_TIRPC   ?= yes
+ WITH_SECCOMP ?= yes
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix     ?= /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+-export libdir      = $(exec_prefix)/lib
++export libdir     ?= $(exec_prefix)/lib64
+ export docdir      = $(prefix)/share/doc
+-export libdbgdir   = $(prefix)/lib/debug$(libdir)
+ export includedir  = $(prefix)/include
+ export pkgconfdir  = $(libdir)/pkgconfig
+ 
+@@ -156,20 +154,17 @@ ifeq ($(WITH_NVCGO), yes)
+ LIB_CPPFLAGS       += -DWITH_NVCGO
+ LIB_LDLIBS_SHARED  += -lpthread
+ endif
+-ifeq ($(WITH_LIBELF), yes)
++# Build with system libelf unconditionally
+ LIB_CPPFLAGS       += -DWITH_LIBELF
+ LIB_LDLIBS_SHARED  += -lelf
+-else
+-LIB_LDLIBS_STATIC  += -l:libelf.a
+-endif
+ ifeq ($(WITH_TIRPC), yes)
+-LIB_CPPFLAGS       += -isystem $(DEPS_DIR)$(includedir)/tirpc -DWITH_TIRPC
+-LIB_LDLIBS_STATIC  += -l:libtirpc.a
+-LIB_LDLIBS_SHARED  += -lpthread
++LIB_CPPFLAGS       += -isystem $(includedir)/tirpc -DWITH_TIRPC
++# dynamically link with system tirpc
++LIB_LDLIBS_SHARED  += -lpthread -ltirpc
+ endif
+ ifeq ($(WITH_SECCOMP), yes)
+-LIB_CPPFLAGS       += -DWITH_SECCOMP $(shell pkg-config --cflags libseccomp)
+-LIB_LDLIBS_SHARED  += $(shell pkg-config --libs libseccomp)
++LIB_CPPFLAGS       += -DWITH_SECCOMP $(shell $(PKG_CONFIG) --cflags libseccomp)
++LIB_LDLIBS_SHARED  += $(shell $(PKG_CONFIG) --libs libseccomp)
+ endif
+ LIB_CPPFLAGS       += $(CPPFLAGS)
+ LIB_CFLAGS         += $(CFLAGS)
+@@ -220,22 +215,14 @@ $(BIN_OBJS): %.o: %.c | shared
+ -include $(DEPENDENCIES)
+ 
+ $(LIB_SHARED): $(LIB_OBJS)
+-	$(MKDIR) -p $(DEBUG_DIR)
+ 	$(CC) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(LIB_LDFLAGS) $(OUTPUT_OPTION) $^ $(LIB_SCRIPT) $(LIB_LDLIBS)
+-	$(OBJCPY) --only-keep-debug $@ $(LIB_SONAME)
+-	$(OBJCPY) --add-gnu-debuglink=$(LIB_SONAME) $@
+-	$(MV) $(LIB_SONAME) $(DEBUG_DIR)
+-	$(STRIP) --strip-unneeded -R .comment $@
+ 
+ $(LIB_STATIC_OBJ): $(LIB_OBJS)
+ 	# FIXME Handle user-defined LDFLAGS and LDLIBS
+ 	$(LD) -d -r --exclude-libs ALL -L$(DEPS_DIR)$(libdir) $(OUTPUT_OPTION) $^ $(LIB_LDLIBS_STATIC)
+-	$(OBJCPY) --localize-hidden $@
+-	$(STRIP) --strip-unneeded -R .comment $@
+ 
+ $(BIN_NAME): $(BIN_OBJS)
+ 	$(CC) $(BIN_CFLAGS) $(BIN_CPPFLAGS) $(BIN_LDFLAGS) $(OUTPUT_OPTION) $^ $(BIN_SCRIPT) $(BIN_LDLIBS)
+-	$(STRIP) --strip-unneeded -R .comment $@
+ 
+ ##### Public rules #####
+ 
+@@ -260,15 +247,9 @@ deps: $(LIB_RPC_SRCS) $(BUILD_DEFS)
+ ifeq ($(WITH_NVCGO), yes)
+ 	$(MAKE) -f $(MAKE_DIR)/nvcgo.mk DESTDIR=$(DEPS_DIR) VERSION_MAJOR=$(VERSION_MAJOR) VERSION=$(VERSION) LIB_NAME=$(LIBGO_NAME) install
+ endif
+-ifeq ($(WITH_LIBELF), no)
+-	$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk DESTDIR=$(DEPS_DIR) install
+-endif
+-ifeq ($(WITH_TIRPC), yes)
+-	$(MAKE) -f $(MAKE_DIR)/libtirpc.mk DESTDIR=$(DEPS_DIR) install
+-endif
+ 
+ install: all
+-	$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(docdir) $(libdbgdir) $(pkgconfdir))
++	$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(includedir) $(bindir) $(libdir) $(pkgconfdir))
+ 	# Install header files
+ 	$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
+ 	# Install library files
+@@ -277,18 +258,18 @@ install: all
+ 	$(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK)
+ ifeq ($(WITH_NVCGO), yes)
+ 	$(INSTALL) -m 755 $(DEPS_DIR)$(libdir)/$(LIBGO_SHARED) $(DESTDIR)$(libdir)
++	# FIXME: for some reason ldconfig stopped creating this symlink after applying Arch Linux LDFLAGS
++	$(LN) -sf $(LIBGO_SHARED) $(DESTDIR)$(libdir)/$(LIBGO_SONAME)
+ 	$(LN) -sf $(LIBGO_SONAME) $(DESTDIR)$(libdir)/$(LIBGO_SYMLINK)
+ endif
+ 	$(LDCONFIG) -n $(DESTDIR)$(libdir)
+-	# Install debugging symbols
+-	$(INSTALL) -m 644 $(DEBUG_DIR)/$(LIB_SONAME) $(DESTDIR)$(libdbgdir)
+ 	# Install configuration files
+ 	$(MAKE_DIR)/$(LIB_PKGCFG).in "$(strip $(VERSION))" "$(strip $(LIB_LDLIBS_SHARED))" > $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
+ 	# Install binary files
+ 	$(INSTALL) -m 755 $(BIN_NAME) $(DESTDIR)$(bindir)
+ 	# Install documentation files
+-	$(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+-	$(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
++	# $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
++	# $(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+ 
+ uninstall:
+ 	# Uninstall header files
+@@ -298,14 +279,12 @@ uninstall:
+ ifeq ($(WITH_NVCGO), yes)
+ 	$(RM) $(addprefix $(DESTDIR)$(libdir)/,$(LIBGO_SHARED) $(LIBGO_SONAME) $(LIBGO_SYMLINK))
+ endif
+-	# Uninstall debugging symbols
+-	$(RM) $(DESTDIR)$(libdbgdir)/$(LIB_SONAME)
+ 	# Uninstall configuration files
+ 	$(RM) $(DESTDIR)$(pkgconfdir)/$(LIB_PKGCFG)
+ 	# Uninstall binary files
+ 	$(RM) $(DESTDIR)$(bindir)/$(BIN_NAME)
+ 	# Uninstall documentation files
+-	$(RM) -r $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
++	# $(RM) -r $(DESTDIR)$(docdir)/$(LIB_NAME)-$(VERSION)
+ 
+ dist: DESTDIR:=$(DIST_DIR)/$(LIB_NAME)_$(VERSION)$(addprefix -,$(TAG))
+ dist: install
+@@ -318,12 +297,6 @@ depsclean:
+ ifeq ($(WITH_NVCGO), yes)
+ 	-$(MAKE) -f $(MAKE_DIR)/nvcgo.mk clean
+ endif
+-ifeq ($(WITH_LIBELF), no)
+-	-$(MAKE) -f $(MAKE_DIR)/elftoolchain.mk clean
+-endif
+-ifeq ($(WITH_TIRPC), yes)
+-	-$(MAKE) -f $(MAKE_DIR)/libtirpc.mk clean
+-endif
+ 
+ mostlyclean:
+ 	$(RM) $(LIB_OBJS) $(LIB_STATIC_OBJ) $(BIN_OBJS) $(DEPENDENCIES)
+diff --git a/mk/common.mk b/mk/common.mk
+index f6d5fbf..594ec08 100644
+--- a/mk/common.mk
++++ b/mk/common.mk
+@@ -19,6 +19,7 @@ RPCGEN   ?= rpcgen
+ BMAKE    ?= MAKEFLAGS= bmake
+ DOCKER   ?= docker
+ PATCH    ?= patch
++PKG_CONFIG ?= pkg-config
+ 
+ UID      := $(shell id -u)
+ GID      := $(shell id -g)
+diff --git a/mk/nvcgo.mk b/mk/nvcgo.mk
+index 0060f0e..877a72b 100644
+--- a/mk/nvcgo.mk
++++ b/mk/nvcgo.mk
+@@ -17,7 +17,7 @@ include $(MAKE_DIR)/common.mk
+ ##### Source definitions #####
+ 
+ PREFIX         := nvcgo
+-SRCS_DIR       := $(DEPS_DIR)/src/$(PREFIX)
++SRCS_DIR       := $(CURDIR)/src/$(PREFIX)
+ VERSION        := $(VERSION)
+ 
+ ##### Public rules #####
+@@ -25,9 +25,6 @@ VERSION        := $(VERSION)
+ .PHONY: all install clean
+ 
+ build:
+-	$(RM) -rf $(SRCS_DIR)
+-	$(CP) -R $(CURDIR)/src/$(PREFIX) $(SRCS_DIR)
+-	$(MAKE) -C $(SRCS_DIR) VERSION=$(VERSION) clean
+ 	$(MAKE) -C $(SRCS_DIR) VERSION=$(VERSION) build
+ 
+ install: build
+diff --git a/mk/nvidia-modprobe.mk b/mk/nvidia-modprobe.mk
+index 1633e0c..2dd519a 100644
+--- a/mk/nvidia-modprobe.mk
++++ b/mk/nvidia-modprobe.mk
+@@ -25,7 +25,7 @@ PATCH_FILE     := $(MAKE_DIR)/nvidia-modprobe.patch
+ 
+ ARFLAGS  := -rU
+ CPPFLAGS := -D_FORTIFY_SOURCE=2 -DNV_LINUX
+-CFLAGS   := -O2 -g -fdata-sections -ffunction-sections -fstack-protector -fno-strict-aliasing -fPIC
++CFLAGS   := -fdata-sections -ffunction-sections -fstack-protector -fno-strict-aliasing -fPIC $(CFLAGS)
+ 
+ ##### Private rules #####
+ 
+diff --git a/src/nvcgo/Makefile b/src/nvcgo/Makefile
+index d2e3667..a8c6bf5 100644
+--- a/src/nvcgo/Makefile
++++ b/src/nvcgo/Makefile
+@@ -31,15 +31,15 @@ OBJ_NAME := $(LIB_NAME).so
+ HDR_NAME := $(LIB_NAME).h
+ CTYPES_H := ctypes.h
+ 
+-CGO_CFLAGS  := -std=gnu11 -O2
+-CGO_LDFLAGS := -Wl,--gc-sections -Wl,-s -Wl,-soname,$(LIB_SONAME)
++CGO_CFLAGS  := -std=gnu11 $(CGO_CFLAGS)
++CGO_LDFLAGS := -Wl,--gc-sections -Wl,-soname,$(LIB_SONAME) $(CGO_LDFLAGS)
+ 
+ build: $(OBJ_NAME)
+ 
+ $(OBJ_NAME): $(wildcard $(CURDIR)/*.go) $(wildcard */*.go)
+ 	export CGO_CFLAGS="$(CGO_CFLAGS)"; \
+-	export CGO_LDFLAGS="$(CGO_LDFLAGS)"; \
+-	$(GO) build -buildvcs=false -o $(@) -ldflags "-s -w" -buildmode=c-shared .
++	export CGO_LDFLAGS="-Wl,--gc-sections -Wl,-soname,$(LIB_SONAME) $(CGO_LDFLAGS)"; \
++	$(GO) build -buildvcs=false -o $(@) -ldflags "$(GO_LDFLAGS)" -buildmode=c-shared .
+ 
+ install: $(OBJ_NAME)
+ 	$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(libdir) $(includedir)/$(PKG_NAME))
diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.19.0.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.19.0.ebuild
new file mode 100644
index 000000000000..4fdd37fd298c
--- /dev/null
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.19.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# check the VERSION in libnvidia-container/mk/nvidia-modprobe.mk
+NVMODV="550.54.14"
+
+DESCRIPTION="NVIDIA container runtime library"
+HOMEPAGE="https://github.com/NVIDIA/libnvidia-container"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}"
+SRC_URI+="
+	https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+IUSE="+seccomp static-libs"
+
+# libtirpc
+# NOTE It seams that library also has optional support for net-libs/libtirpc, but I didn't
+#      manage to build without it, probably the support for that build-roted away.
+DEPEND="
+	net-libs/libtirpc:=
+	sys-libs/libcap
+	virtual/libelf:=
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="${DEPEND}
+	elibc_glibc? ( x11-drivers/nvidia-drivers )
+"
+
+BDEPEND="
+	dev-lang/go
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.19.0-fix-makefile.patch"
+)
+
+DOCS=( NOTICE README.md )
+
+src_unpack() {
+	default_src_unpack
+	if [[ "${PV}" == "9999" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# nvidia-modprobe patching based on libnvidia-container/mk/nvidia-modprobe.mk
+	mkdir -p "${S}"/deps/src/nvidia-modprobe-"${NVMODV}" || die
+	cp -r "${NVMODS}"/modprobe-utils/ "${S}"/deps/src/nvidia-modprobe-"${NVMODV}"/ || die
+	touch "${S}/deps/src/nvidia-modprobe-${NVMODV}/.download_stamp" || die
+	pushd "${S}/deps/src/nvidia-modprobe-${NVMODV}" || die
+	eapply -p1 "${S}"/mk/nvidia-modprobe.patch
+	popd || die
+
+	if ! tc-is-gcc; then
+		ewarn "libnvidia-container must be built with gcc because of option \"-fplan9-extensions\"!"
+		ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+		export CC=${CHOST}-gcc AR=${CHOST}-gcc-ar
+		tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+	fi
+
+	default
+}
+
+src_configure() {
+	export GOPATH="${S}"
+	export GOFLAGS="-mod=vendor"
+	export CFLAGS="${CFLAGS}"
+	export LDFLAGS="${LDFLAGS}"
+	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
+	export CGO_LDFLAGS="${CGO_LDFLAGS:-$LDFLAGS}"
+
+	tc-export LD OBJCOPY PKG_CONFIG
+
+	# we could also set GO compiller, but it currently defaults to gccgo, but as for now I believe
+	# most users will prefer dev-lang/go and they usually don't define GO="go" their make.conf either.
+	# tc-export GO
+
+	my_makeopts=(
+		prefix="${EPREFIX}/usr"
+		libdir="${EPREFIX}/usr/$(get_libdir)"
+		GO_LDFLAGS="-compressdwarf=false -linkmode=external"
+		WITH_SECCOMP="$(usex seccomp)"
+	)
+	# WITH_TIRPC="$(usex libtirpc)"
+
+	if [[ "${PV}" != "9999" ]] ; then
+		IFS='_' read -r MY_LIB_VERSION MY_LIB_TAG <<< "${PV}"
+
+		my_makeopts=( "${my_makeopts[@]}"
+			REVISION="${PV}"
+			LIB_VERSION="${MY_LIB_VERSION}"
+			LIB_TAG="${MY_LIB_TAG}"
+		)
+	fi
+}
+
+src_compile() {
+	emake "${my_makeopts[@]}"
+}
+
+src_install() {
+	emake "${my_makeopts[@]}" DESTDIR="${D}" install
+	# Install docs
+	einstalldocs # Bug 831705
+	# Cleanup static libraries
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die # Bug 783984
+	fi
+}
diff --git a/sys-libs/zlib/zlib-1.3.2.ebuild b/sys-libs/zlib/zlib-1.3.2.ebuild
deleted file mode 100644
index 4e1b9e6eeb13..000000000000
--- a/sys-libs/zlib/zlib-1.3.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2026 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.
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc
-inherit autotools dot-a edo multilib-minimal flag-o-matic verify-sig
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="
-	https://zlib.net/${P}.tar.xz
-	https://zlib.net/fossils/${P}.tar.xz
-	https://zlib.net/current/beta/${P}.tar.xz
-	https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz
-	verify-sig? (
-		https://zlib.net/${P}.tar.xz.asc
-		https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz.asc
-	)
-"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	minizip? ( ${AUTOTOOLS_DEPEND} )
-	verify-sig? ( sec-keys/openpgp-keys-madler )
-"
-
-PATCHES=(
-	# Don't install unexpected & unused crypt.h header (which would clash with other pkgs)
-	# Pending upstream. bug #658536
-	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
-	# Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
-	"${FILESDIR}"/${PN}-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch
-
-	# On Darwin, don't force /usr/bin/libtool as AR. bug #924839
-	"${FILESDIR}"/${PN}-1.3.1-configure-fix-AR-libtool-on-darwin.patch
-)
-
-src_prepare() {
-	default
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-		*-mingw*|mingw*)
-			# Uses preconfigured Makefile rather than configure script
-			multilib_copy_sources
-
-			;;
-	esac
-}
-
-src_configure() {
-	use static-libs && lto-guarantee-fat
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	case ${CHOST} in
-		*-mingw*|mingw*)
-			;;
-
-		*)
-			# bug #347167
-			local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
-
-			# for GNU Hurd
-			if [[ ${uname} == gnu ]] ; then
-				uname=GNU
-			fi
-
-			local myconf=(
-				--shared
-				--prefix="${EPREFIX}/usr"
-				--libdir="${EPREFIX}/usr/$(get_libdir)"
-				${uname:+--uname=${uname}}
-			)
-
-			# Not an autoconf script, so can't use econf
-			edo "${S}"/configure "${myconf[@]}"
-
-			;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-		*-mingw*|mingw*)
-			emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-			sed \
-				-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
-				-e 's|@exec_prefix@|${prefix}|g' \
-				-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@includedir@|${prefix}/include|g' \
-				-e 's|@VERSION@|'${PV}'|g' \
-				zlib.pc.in > zlib.pc || die
-			;;
-
-		*)
-			emake
-
-			;;
-	esac
-
-	use minizip && emake -C contrib/minizip
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-		*-mingw*|mingw*)
-			emake -f win32/Makefile.gcc install \
-				BINARY_PATH="${ED}/usr/bin" \
-				LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-				INCLUDE_PATH="${ED}/usr/include" \
-				SHARED_MODE=1
-
-			# Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins zlib.pc
-
-			;;
-
-		*)
-			emake install DESTDIR="${D}" LDCONFIG=:
-
-			;;
-	esac
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-
-		# This might not exist if slibtool is used.
-		# bug #816756
-		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
-	fi
-
-	if ! use static-libs ; then
-		# bug #419645
-		rm "${ED}"/usr/$(get_libdir)/libz.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	strip-lto-bytecode
-
-	dodoc FAQ README ChangeLog doc/*.txt
-
-	if use minizip ; then
-		dodoc contrib/minizip/*.txt
-		doman contrib/minizip/*.1
-	fi
-}