Merge updates from master

acct-group/librarian/librarian-0.ebuild

@@ -1,10 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="A group for www-apps/librarian"
-ACCT_GROUP_ID=-1
-SLOT="0"

acct-group/librarian/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>benoit.dufour@mail.com</email>
-<name>Benoît Dufour</name>
-</maintainer>
-</pkgmetadata>

acct-user/librarian/librarian-0.ebuild

@@ -1,13 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="An user for www-apps/librarian"
-ACCT_USER_ID=-1
-ACCT_USER_GROUPS=( librarian )
-ACCT_USER_HOME="/var/cache/${PN}"
-acct-user_add_deps
-SLOT="0"

acct-user/librarian/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>benoit.dufour@mail.com</email>
-<name>Benoît Dufour</name>
-</maintainer>
-</pkgmetadata>

app-containers/nvidia-container-toolkit/Manifest

@@ -1,2 +1 @@
-DIST nvidia-container-toolkit-1.14.6.tar.gz 2419037 BLAKE2B 6d0dc186a49b2d1cb09fda3f3c4e3361e22f8891cba96cfaa14f2b70f887040b5b637125f7581159aa4a3e0f4c0542f0899e1d0708806767091a9cc34828deac SHA512 710ccaf80b358c3c420cfc00d34eb9a932feff058de911b87783211a30011af01016047f9e62f055d805234d602cf3bbb2b593825fde2a6f00aa505fea7f3719
 DIST nvidia-container-toolkit-1.16.1.tar.gz 2642534 BLAKE2B 0b286accab4b6730b1e3b15a726bc5e20ffae9b6816f0fb840013291fdbf9151cd39d8a8e7a97697113c0c4ec88c9fc9e9551e66ec1c3fb61dfa76e31bc41f44 SHA512 691d4fc47ea60b730ec491b333aa8118bcfd62cdab20a42b84155c6a13484d920e758435b5029bbae4fbefce82352aa5764f1554992682f689c95615809fb83c

app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.14.6.ebuild

@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGO_PN="github.com/NVIDIA/${PN}"
-
-inherit go-module
-
-DESCRIPTION="NVIDIA container runtime toolkit"
-HOMEPAGE="https://github.com/NVIDIA/nvidia-container-toolkit"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
-	inherit git-r3
-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
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-
-# Some tests may require specific environmental setups or additional hardware.
-RESTRICT="test" # Bug 831702
-
-RDEPEND="
-	sys-libs/libnvidia-container:0/${PV}
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	app-arch/unzip
-	dev-build/make
-"
-
-src_compile() {
-	emake binaries
-}
-
-src_install() {
-	# Fixed by https://github.com/vizv
-	dobin "nvidia-container-runtime"
-	dobin "nvidia-container-runtime-hook"
-	dobin "nvidia-ctk"
-	insinto "/etc/nvidia-container-runtime"
-	doins "${FILESDIR}/config.toml"
-}
-
-pkg_postinst() {
-	elog "Your docker service must restart after install this package."
-	elog "OpenRC: sudo rc-service docker restart"
-	elog "systemd: sudo systemctl restart docker"
-	elog "You may need to edit your /etc/nvidia-container-runtime/config.toml"
-	elog "file before running ${PN} for the first time."
-	elog "For details, please see the NVIDIA docker manual page."
-}

app-misc/anki-bin/anki-bin-24.06.3-r1.ebuild

@@ -56,7 +56,7 @@ RDEPEND="
 		dev-python/flask-cors[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/protobuf[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 		dev-python/waitress[${PYTHON_USEDEP}]

dev-libs/librepo/Manifest

@@ -1 +1,2 @@
 DIST librepo-1.18.1.tar.gz 841526 BLAKE2B 62860d29df4a7288802098f866a17862dd803ffdf58dd78f0dbcb439ee04f8713e644c17e75bb273dccc461c6b654c5092fcc81eecc1119ff302a8d548ee680e SHA512 bc5ef06786f3bd10bc096fa72543be2f528388e1490de6dc95e78c5f0f81511d24346a0fd55a37e844f7ea2864dd53d2ae921e767cd6f721b2c0a7fb6c9ab9f7
+DIST librepo-1.19.0.tar.gz 841780 BLAKE2B 01689cc356a946c61d2018e892d60436fcb7fed02965bb1c48864f6b1735741039e02d4d2471d7659c9dcf0cece5c3b2fdeba8f0696aa1c560cb837fbd2967a5 SHA512 dd6c0cc69a3fa7324e0753b260a394a0ac5587ca73a6d5d567c63e92ced0d71b35b48db573130cfcce2b6bd582fe486f40ca3299439742f0287778f613195e2d

dev-libs/librepo/librepo-1.19.0.ebuild

@@ -0,0 +1,57 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Repodata downloading library"
+HOMEPAGE="https://github.com/rpm-software-management/librepo"
+SRC_URI="https://github.com/rpm-software-management/librepo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc gpgme test +zchunk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66:2
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	>=net-misc/curl-7.52.0
+	gpgme? ( app-crypt/gpgme:1= )
+	!gpgme? ( >=app-arch/rpm-4.18.0 )
+	zchunk? ( >=app-arch/zchunk-0.9.11 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	# getxattr does not seem to work well under QA box. bug #934951
+	"${FILESDIR}/${PN}-1.18.0-disable-checksum-test.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# respect temp directory during tests, bug #924463
+	sed -i "s|/tmp/|${T}/|" tests/testsys.h || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_PYTHON=OFF
+		-DENABLE_SELINUX=OFF
+		-DUSE_GPGME=$(usex gpgme)
+		-DENABLE_DOCS=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+		-DWITH_ZCHUNK=$(usex zchunk)
+	)
+	cmake_src_configure
+}

dev-libs/libsolv/Manifest

@@ -1 +1,2 @@
 DIST libsolv-0.7.30.tar.gz 762322 BLAKE2B 2d731d87fa71693d1af98f6290536d73bc398a319c63fd5444e5861a5eede58a5b966faa73af99f09d2c623314bd9fbca74700ba4827bb6f749ff0a450d133bc SHA512 65b385b6a303f40aeb49a67185469c9d554669a08e3c9529e5487fd31c7f4b25565899b2c20bbab69a44cfd7cc746b88d2b05c49d02c94a3cfa81f9142274f4e
+DIST libsolv-0.7.31.tar.gz 763630 BLAKE2B 5580376c23a8c5f72519b34b65800ecdffd2ed318ec929684a1de55f079f795e5118daca29d7d2510c30a8bd78e6db0ff450ff4db93d56a7a1c02fbe7a144e4c SHA512 96065ebec7e4d00f55a4e2f0fb1c519bf7b3220c47033071b183eea3f5b72499eda492e7b84754443f59dcbfd47e714808252f7a46de239ed16accdab4f66e4a

dev-libs/libsolv/libsolv-0.7.31.ebuild

@@ -0,0 +1,51 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for solving packages and reading repositories"
+HOMEPAGE="https://github.com/openSUSE/libsolv"
+SRC_URI="https://github.com/openSUSE/libsolv/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="expat test zchunk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/rpm
+	app-arch/xz-utils
+	app-arch/zstd:=
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2 )
+	zchunk? ( app-arch/zchunk )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# remove forced CFLAGS -g -O2; bug 936869
+	sed "/CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^}/d" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_COMPLEX_DEPS=ON
+		-DENABLE_COMPS=ON
+		-DENABLE_RPMDB=ON
+		-DENABLE_RPMMD=ON
+		-DENABLE_RPMPKG_LIBRPM=ON
+		-DENABLE_BZIP2_COMPRESSION=ON
+		-DENABLE_LZMA_COMPRESSION=ON
+		-DENABLE_ZSTD_COMPRESSION=ON
+		-DWITH_LIBXML2=$(usex !expat)
+		-DWITH_SYSTEM_ZCHUNK=$(usex zchunk)
+	)
+	cmake_src_configure
+}

dev-python/PythonQwt/Manifest

@@ -1,2 +1,2 @@
-DIST pythonqwt-0.12.6.tar.gz 1217432 BLAKE2B 5178eded8d2b947854e48b31f74888184d6d4de3a2681c3bca6aca69b95dbfc8d7d31e65844b0dbfc6847415bd47367a1ea35db7a1ffc4f61270ebb9781b9c46 SHA512 59808929ff835db46b47e63babc2a4b320b2606b7b836ddd21304af1f6c3be1afae4e0329d8a55a17951807e7b8cfa9b89c58cc5d8439612d20ed655c04db484
 DIST pythonqwt-0.12.7.tar.gz 1217648 BLAKE2B 6c9dbaa893d6124ace07f9749d8b668fc5627269e3cabfab129fc04e3a511c971a2bd34d0bfc33da96715f7f8601e6d2d179584e8166f876296dc13d536ca710 SHA512 87af1d62e98798f5f616b7b008d704d943ae3c662b254f3243b3d9f4e5efab2f68b28c4820be6894b35852c9a5c14fa27c07868a28aacc6c9cd10ed7a674cfc2
+DIST pythonqwt-0.14.1.tar.gz 1217982 BLAKE2B 55b59568a93a8bf1d03218cfb7e79d781eb741120fcdace7d6ae7aae50b30c90283de48ba4741deb4f33f560ed7d79dbfc9a7be70d95737200d9e88833d7f012 SHA512 d032d2422b801a567cd2dc92f630cc5cfc8fd27447134381bf83033ca45c55904c859bd950ceae2efc204cbdafcce4a03045f2680f008e245fabbdde7cf115de

dev-python/PythonQwt/PythonQwt-0.14.1.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11,12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1 pypi
 

dev-python/faust-cchardet/Manifest

@@ -1,3 +0,0 @@
-DIST faust-cchardet-2.1.18.tar.gz 312626 BLAKE2B 33ffa2e4982218bbee72eb8028e15333563988ddb0d136f1e46acb810f005aab32ff7f58ee422d3a0a1348bdcfd2abfba549ed5467f9adc384f534b297ceb319 SHA512 0213a58e7c8104281e69a4fc8ffe90fc892efd783481d31a6b7aa812fe86534e15a209486b947b48e0063b5176f3aaebc9e702ab2e05d11151ba672a06aa3397
-DIST faust-cchardet-2.1.19.tar.gz 312664 BLAKE2B 9d07908d17a69268216777059c35569f5d15325c2371e2efd633e07c4de2e767ce12cbf70a53e70216510ceb752eda9bf9dce4b93f74fca60aa59ad1f739b1f4 SHA512 255122fc3cf67f752edb3a45718a2b2456f1b22a1fbec0efd417a404a4d15542a44e5d463eec2581ae34277df80621a5e20ce90bef99661c7a762b469e3b46aa
-DIST uchardet-bdb8a0376ddf5d3cab6397be0bad98dad106d77f.tar.gz 322644 BLAKE2B cd2bf0a7e6ad29b7641449fa7ea7eecda375ad59ebe04768df6824387d0e33cf7f543afefa972a1e369a0be8f064f87d8eddca5bc048c740d64af05f664ec30d SHA512 a7dd1e5d41484df22e1048a319b05f4dc9d917c91440eda557084049da08b0e7fc3b18f2531fc1418857cda94dfd0deea984728b2a9747e369804ed7137ed6bc

dev-python/faust-cchardet/faust-cchardet-2.1.18.ebuild

@@ -1,46 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-GIT_SUBMODULES=(
-	"PyYoshi uchardet bdb8a0376ddf5d3cab6397be0bad98dad106d77f src/ext/uchardet"
-)
-submodule_uris() {
-	local g
-	for g in "${GIT_SUBMODULES[@]}"; do
-		g=(${g})
-		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
-	done
-}
-
-DESCRIPTION="universal character encoding detector"
-HOMEPAGE="https://github.com/faust-streaming/cChardet"
-SRC_URI="
-	https://github.com/faust-streaming/cChardet/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(submodule_uris)
-"
-
-S="${WORKDIR}/cChardet-${PV}"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-python/cython"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	local g
-	for g in "${GIT_SUBMODULES[@]}"; do
-		g=(${g})
-		mv "${WORKDIR}/${g[1]}-${g[2]}"/* "${S}/${g[3]}" || die "could not move submodule ${g[2]}"
-	done
-}

dev-python/faust-cchardet/faust-cchardet-2.1.19.ebuild

@@ -1,46 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1
-
-GIT_SUBMODULES=(
-	"PyYoshi uchardet bdb8a0376ddf5d3cab6397be0bad98dad106d77f src/ext/uchardet"
-)
-submodule_uris() {
-	local g
-	for g in "${GIT_SUBMODULES[@]}"; do
-		g=(${g})
-		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
-	done
-}
-
-DESCRIPTION="universal character encoding detector"
-HOMEPAGE="https://github.com/faust-streaming/cChardet"
-SRC_URI="
-	https://github.com/faust-streaming/cChardet/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(submodule_uris)
-"
-
-S="${WORKDIR}/cChardet-${PV}"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-python/cython"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	local g
-	for g in "${GIT_SUBMODULES[@]}"; do
-		g=(${g})
-		mv "${WORKDIR}/${g[1]}-${g[2]}"/* "${S}/${g[3]}" || die "could not move submodule ${g[2]}"
-	done
-}

dev-python/faust-cchardet/metadata.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
-<pkgmetadata>
-	<maintainer type="person">
-		<email>smaniotto.nicola@gmail.com</email>
-		<name>Nicola Smaniotto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">faust-streaming/cChardet</remote-id>
-	</upstream>
-</pkgmetadata>

dev-python/guidata/Manifest

@@ -1,2 +1,2 @@
-DIST guidata-3.6.2.tar.gz 718258 BLAKE2B 197698ec37ff44c4a75b812f8ae36a3662af43bc366e619b954489d48ae146705b6d4321a4a3f05ce20bfdb60b205a5b90bb4b6379cdb7383efbf9f669317381 SHA512 29459d9a08cf42f89d5d98eca4f729670a1d47921039debcc3a4e9d1fbca812ed1d3c059e70ae76a19d85ad7c41122097ccbf5dbde6046b81a18a96a7e606851
 DIST guidata-3.6.3.tar.gz 718459 BLAKE2B f3ec7bd4d367afe05741498df15ddef1904962c826fc0ce8200a72d3f46fdc198ba0facb5f9010f94be21506e7f43a02c4ffab6ca7d8adf27ab01efae493a1fe SHA512 b3e53dace35c19e30be19bdf91454322445446d87f2d278f6749b3c7d5b7029dc7786ccdd48baa9b10991a076d83084fac4cfb39a86f695659e37c5be28ed28a
+DIST guidata-3.7.1.tar.gz 719179 BLAKE2B 8b59ed049c2bb765d9a3d57db02e07ffe3732fb28084d56c0f193c3d525d946f084293c45db1feade4ffa9418331d4cdc7091b15c8d2c3cfdfe9e3b0baedccf9 SHA512 04238f61e6eeb8e8ac85f09a8ad5945026ef7d65ef793e047ff86c5783ced35cbcce53fdd0688814107986782ab159560de77692c4720db5d85efb829b4ffd57

dev-python/guidata/guidata-3.7.1.ebuild

@@ -9,17 +9,21 @@ PYTHON_COMPAT=( python3_{11..12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Library for user interfaces for easy dataset editing and display"
-HOMEPAGE="https://pypi.python.org/pypi/guidata"
+HOMEPAGE="https://pypi.org/project/guidata/"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
-IUSE="test"
+IUSE="test +pyqt5 pyqt6"
+
+REQUIRED_USE="|| ( pyqt5 pyqt6 )"
 
 RDEPEND="
+	pyqt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+	pyqt6? ( dev-python/PyQt6[${PYTHON_USEDEP}] )
+
 	dev-python/h5py[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/QtPy[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]

dev-python/guiqwt/guiqwt-4.4.5-r1.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/PlotPyStack/guiqwt/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 RESTRICT="test"
 
 RDEPEND="

dev-python/jpype/jpype-1.5.0-r1.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
@@ -17,7 +17,10 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="virtual/jdk"
+RDEPEND="
+	dev-python/gpep517
+	virtual/jdk
+"
 
 src_prepare() {
 	sed -i "s/'-g0', //g;s/, '-O2'//g"  "${S}"/setupext/platform.py || die

dev-python/mpxj/Manifest

@@ -1 +1 @@
-DIST mpxj-13.5.1-py3-none-any.whl 26172521 BLAKE2B 10a24a8bd53fdb822d56eac60640c656a63ca5bb5674a3e64f5574a32f5d6256d8633796bac2cae3e391e9fcc161337aed847e3128de50da298239bbc81cc201 SHA512 bc02596f2fdcbeb6da865cbad5b51f8139369ed076ff085c1ff7656cc37af4ccac08244d751624df96bf3f9ea4a1ea56b68a64f5f24508fe35dc16d95fddea85
+DIST mpxj-13.6.0-py3-none-any.whl 26175997 BLAKE2B 417739ee5abac5cec2ab2a48c8c48bd644c07ee8e193ba6dd0e6a087aa1da73eac64f3086001e283d79630bff9e86cb9385f08a4a37a70133cbb82e130151deb SHA512 b90d88f3efd8daf9292245969a73eed3a6a386f65eaa444c5b58523ae1b240cc61d0a314c8b4f69a58e44d20c68cdb6af87665f3159cef47e0c338133e4fb93f

dev-python/mpxj/mpxj-13.6.0-r1.ebuild

@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -21,6 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
+	dev-python/gpep517
 	>=dev-python/jpype-1.5.0
 "
 

dev-python/python-statemachine/Manifest

@@ -1,2 +1,2 @@
-DIST python-statemachine-2.3.5.gh.tar.gz 350690 BLAKE2B 8a16722b62d07df47d15b32374575ba3beb3a575ad55507cee7b1b8e58c6a35635c8571a25b5cae1d56167736f38101fdf099b725f19ae6adde8ef5641c372ac SHA512 1a9dbd3e835ecfaa46f0aff8d487836962f4ba1856a64ab3f02976871a91713193cda16faa817ae1cfd4a94e42cad22f6d896d3b57b63128d85ea0bba8e5f44c
 DIST python-statemachine-2.3.6.gh.tar.gz 351057 BLAKE2B 03d605b0389dd9fac3e2d8a979295ab7724a79b2b1e677cbd114d8eddaa9a987f361aebbea29eb670930fd7978cb1d9f59ef2a40ec98f9c515d080fcc902f25c SHA512 cc8400a118da6d54b97108ff8b11462aee32dc28ada97fbf2a68049de2659c5a7faaa24802fab376b72586c1052db13b67b570a5d62eb9c28252572d14634215
+DIST python-statemachine-2.4.0.gh.tar.gz 362766 BLAKE2B 79a34b43841cf920ae1eb87821c19d31f4dc1eb59903ad1cce6166586b44ed7437278ae647ffac190bd1dc795d251b81022b51aef644607d5f2f7b92f1c89e9e SHA512 fc51668efee69a2a59c5f3a5bbb08e6a6647a819175bbd02305e6eac51d0f8ef31c4e89f85dcb7451c24681ee76f0534e676995e134c0cbbed4d680c5418c612

dev-python/readability-lxml/readability-lxml-0.8.1.ebuild

@@ -27,7 +27,7 @@ RDEPEND="
 	|| (
 		dev-python/chardet[${PYTHON_USEDEP}]
 		( $(python_gen_cond_dep \
-			'dev-python/cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
+			'dev-python/faust-cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
 	)
 "
 BDEPEND="

dev-python/signalstickers-client/signalstickers-client-3.3.0.ebuild

@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/anyio[${PYTHON_USEDEP}]
 	dev-python/httpx[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/protobuf[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-httpx[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]

dev-python/steam/steam-1.4.4.ebuild

@@ -21,7 +21,7 @@ DEPEND="dev-python/six
 	dev-python/requests
 	dev-python/urllib3
 	dev-python/vdf
-	dev-python/protobuf-python
+	dev-python/protobuf
 	dev-python/cachetools
 "
 

dev-python/steam/steam-9999.ebuild

@@ -17,7 +17,7 @@ DEPEND="dev-python/six
 	dev-python/requests
 	dev-python/urllib3
 	dev-python/vdf
-	dev-python/protobuf-python
+	dev-python/protobuf
 	dev-python/cachetools
 "
 LICENSE="GPL-3"

games-util/chiaki/chiaki-2.1.1-r2.ebuild

@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/protobuf[${PYTHON_USEDEP}]')
 	dev-libs/protobuf
 	virtual/pkgconfig
 "

games-util/chiaki/chiaki-9999.ebuild

@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/protobuf[${PYTHON_USEDEP}]')
 	dev-libs/protobuf
 	virtual/pkgconfig
 "

gui-wm/niri/Manifest

@@ -1,2 +1,4 @@
+DIST niri-0.1.10.1-vendored-dependencies.tar.xz 53928792 BLAKE2B 28eb1d090b12f8b324e89d807b0999161360ecc71fc2b3d2b5e7a1cdcb7313e307867f4a763a6124d4bde46c28b90fa3797d75d62fa1b20ac3ae998b69cf94cd SHA512 7ee23334de2dacfdd6e2f73b2056ed81af39abef132d423c9c6097de367f7be3e0ba1694b4818f0ee89518c0e379aafd0ece426ac97a52a5b9c96bd9532ed49e
+DIST niri-0.1.10.1.tar.gz 429116 BLAKE2B 394cce3c11d19ef65d450a0e402e3c97affdff798340bb37aba90ea9b49c4cb5e7417873bd0e66bafb2ff035d71ddfca14fb91a86aa997dc23534bd1eff48035 SHA512 ba816350bad30debcb961d6c516c96a0a732621e78e08f7f04bbf3bee46cb463318a59acf532660288022a247cfcd636d59159b66fd01c1c702d58f8ddf44e6a
 DIST niri-0.1.9-vendored-dependencies.tar.xz 52231744 BLAKE2B c9b7a1a508f273a59219437c644bc954398277ddec772c53dc35556736244b5230ab1a0aa9e31f9b418215d634b05565e1c3331f882a6616e4036d29892a29d3 SHA512 88db732c9d2c81e4285ce0e67ef1c4778367e4ff1540b43d7922b85add199c6f2f29e03d1bc78d321f79684bd6fd0ca3b06533491a5b02cf4872e5dd661a93d2
 DIST niri-0.1.9.tar.gz 409640 BLAKE2B 86caa9f2b9a468c5aef8041f902bbbd252200ab2fda4da5bf9d0997d61014b8f99336dd2b0579cf754d188ce51dfbcee0d83f413d8a10dba451c104a69f73ca0 SHA512 7436ad537b6f4e2d0b05731d94bf02594310526843083a175c061327958d7673d19ec601732969f9910c4e41b97be64a04d2a1eac3c7ec19c4d71a31fdad8d6c

gui-wm/niri/niri-0.1.10.1.ebuild

@@ -0,0 +1,88 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {16..19} )
+RUST_MIN_VER="1.77.0"
+
+inherit llvm-r1 cargo systemd
+
+DESCRIPTION="Scrollable-tiling Wayland compositor"
+HOMEPAGE="https://github.com/YaLTeR/niri"
+SRC_URI="
+	https://github.com/YaLTeR/niri/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/YaLTeR/niri/releases/download/v${PV}/${P}-vendored-dependencies.tar.xz
+"
+
+LICENSE="GPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
+	Unicode-3.0 Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+dbus screencast systemd"
+REQUIRED_USE="
+	screencast? ( dbus )
+	systemd? ( dbus )
+"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libinput:=
+	dev-libs/wayland
+	media-libs/libdisplay-info:=
+	media-libs/mesa
+	sys-auth/seatd:=
+	virtual/libudev:=
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	screencast? (
+		media-video/pipewire:=
+	)
+"
+RDEPEND="${DEPEND}"
+# Clang is required for bindgen
+BDEPEND="
+	screencast? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}') )
+"
+
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+QA_FLAGS_IGNORED="usr/bin/niri"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	rust_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's/git = "[^ ]*"/version = "*"/' Cargo.toml || die
+	default
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev dbus)
+		$(usev screencast xdp-gnome-screencast)
+		$(usev systemd)
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	dobin resources/niri-session
+	systemd_douserunit resources/niri{.service,-shutdown.target}
+
+	insinto /usr/share/wayland-sessions
+	doins resources/niri.desktop
+
+	insinto /usr/share/xdg-desktop-portal
+	doins resources/niri-portals.conf
+}

net-libs/usockets/usockets-0.8.8.ebuild

@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
+IUSE="asio libuv +ssl"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
+REQUIRED_USE="?? ( asio libuv )"
-RESTRICT="!test? ( test )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
-	       LIB="$(get_libdir)" \
+		LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
-	       WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
-	       WITH_ASIO="$(usex asio 1 0)"
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs

net-libs/usockets/usockets-9999.ebuild

@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
+IUSE="asio libuv +ssl"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
+REQUIRED_USE="?? ( asio libuv )"
-RESTRICT="!test? ( test )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
-	       LIB="$(get_libdir)" \
+		LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
-	       WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
-	       WITH_ASIO="$(usex asio 1 0)"
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs

profiles/package.mask

@@ -24,11 +24,6 @@
 # Removal on 2025-01-13
 gui-apps/riverguile
 
-# Eli Schwartz <eschwartz@gentoo.org> (2024-11-12)
-# Duplicate of dev-python/cchardet. Unused by any packages.
-# Removal on 2024-12-12
-dev-python/faust-cchardet
-
 # Takuya Wakazono <pastalian46@gmail.com> (2024-11-10)
 # Upstream doesn't want us to package their software, so they
 # intentionally make it harder to unbundle dependencies.
@@ -87,11 +82,6 @@ dev-games/liblcf
 # Removal on 2024-11-17
 games-engines/easyrpg-player
 
-# Takuya Wakazono <pastalian46@gmail.com> (2024-10-13)
-# Archived upstream. Mismatched src filesize.
-# Removal on 2024-11-13.
-www-apps/librarian
-
 # Takuya Wakazono <pastalian46@gmail.com> (2024-10-02)
 # Depends on <media-libs/kimageannotator-0.7, which has been dropped.
 # Upstream is working on Qt6 port.

sys-apps/dnf5/Manifest

@@ -1 +1,2 @@
 DIST dnf5-5.2.6.0.tar.gz 1345711 BLAKE2B 5f5eb39379ec8f50c5a2ba5a92eaf4adeb2eefd1ad4cfa1a73bd1a1dd0e91f2882967864524f520c512f03eb7d04f58515e5356513a3cb490d06e733051ca2d7 SHA512 4c1ccf77e0f34415df2cd1530672053d9acb53c10ca0880c1f7c4ad0fcbebf13ffa31a075d0ccd740969b48f0634b80d8c014ecd0eaa36bbce40d49f420a3216
+DIST dnf5-5.2.7.0.tar.gz 1571567 BLAKE2B 92dec0c3a89b6d6d15ff7c5cf683d906d72b8a52fac0d2473410dd3422c50970e97e621c07424aa9d8323ca623bf771b54edc991aa5d825bc141267bf9fe3c05 SHA512 f3ade5df924efc9b07e7e7f7e80cd940dd61b4bdcc48a5c093e87190e9e207083e0f19a2218958f9d36b390f2984deff3d2f5b5bc6953e62173bc567e5e060d7

sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild

@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-arch/rpm-4.17.0
-	dev-cpp/sdbus-c++:=
+	dev-cpp/sdbus-c++:0/1
 	dev-cpp/toml11
 	>=dev-db/sqlite-3.35.0:3
 	>=dev-libs/glib-2.46.0:2
@@ -48,6 +48,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.2.5.0-remove-empty-dir.patch"
 	# Prevent test suite from writing to system files.
 	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
+	# bug #939518
+	"${FILESDIR}/${P}-remove-buggy-tests.patch"
 )
 
 src_prepare() {

sys-apps/dnf5/dnf5-5.2.7.0.ebuild

@@ -0,0 +1,78 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Command-line package manager"
+HOMEPAGE="https://github.com/rpm-software-management/dnf5"
+SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nls systemd test"
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/rpm-4.17.0
+	dev-cpp/sdbus-c++:0/1
+	dev-cpp/toml11
+	>=dev-db/sqlite-3.35.0:3
+	>=dev-libs/glib-2.46.0:2
+	dev-libs/json-c:=
+	dev-libs/libfmt:=
+	>=dev-libs/librepo-1.17.1
+	>=dev-libs/libsolv-0.7.25
+	dev-libs/libxml2
+	sys-apps/util-linux
+	>=sys-libs/libmodulemd-2.11.2
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/breathe
+	dev-python/sphinx
+	virtual/pkgconfig
+	test? (
+		app-arch/rpm
+		app-arch/createrepo_c
+		dev-util/cppunit
+	)
+"
+
+PATCHES=(
+	# Prevent test suite from writing to system files.
+	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
+	# bug #939518
+	"${FILESDIR}/${PN}-5.2.6.0-remove-buggy-tests.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# Replace hardcoded TMPDIR.
+	sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die
+	# remove -Werror{,=unused-result}; bug 936870
+	sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HTML=OFF
+		-DWITH_PERL5=OFF
+		-DWITH_PYTHON3=OFF
+		-DWITH_RUBY=OFF
+		-DWITH_ZCHUNK=OFF
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_TRANSLATIONS=$(usex nls)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	cmake_src_compile doc-man
+}

sys-apps/dnf5/files/dnf5-5.2.6.0-remove-buggy-tests.patch

@@ -0,0 +1,22 @@
+Those tests causes a use-after-free.
+https://bugs.gentoo.org/939518
+https://github.com/rpm-software-management/dnf5/issues/1692
+diff --git a/test/dnf5-plugins/copr_plugin/CMakeLists.txt b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
+index 2a99f6c6..ce87b437 100644
+--- a/test/dnf5-plugins/copr_plugin/CMakeLists.txt
++++ b/test/dnf5-plugins/copr_plugin/CMakeLists.txt
+@@ -24,5 +24,3 @@ target_link_libraries(run_tests_copr PRIVATE ${JSONC_LIBRARIES})
+ 
+ add_compile_definitions(TEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
+ 
+-add_test(NAME test_copr COMMAND run_tests_copr)
+-set_tests_properties(test_copr PROPERTIES RUN_SERIAL TRUE)
+diff --git a/test/libdnf5-cli/CMakeLists.txt b/test/libdnf5-cli/CMakeLists.txt
+index e37cbfa5..02722d40 100644
+--- a/test/libdnf5-cli/CMakeLists.txt
++++ b/test/libdnf5-cli/CMakeLists.txt
+@@ -19,4 +19,3 @@ target_link_directories(run_tests_cli PRIVATE ${CMAKE_BINARY_DIR}/libdnf5)
+ target_link_libraries(run_tests_cli PRIVATE stdc++ libdnf5_static libdnf5-cli cppunit test_shared)
+ 
+ 
+-add_test(NAME test_libdnf_cli COMMAND run_tests_cli)

sys-libs/libnvidia-container/Manifest

@@ -1,3 +1,3 @@
-DIST libnvidia-container-1.14.6.tar.gz 1549174 BLAKE2B d3c526d7b04ac9cbc6b6bb63f25d4c5b17571169a6cb1a6ab9f7c1cc322a27e3a853373551682b535146914fd2eca809d02391acb458a874a7e9e5c0fc8bf459 SHA512 598f4b2752615bfe44782a60cd2afee769fde496c6bdff613f58c4a3f0b02f8b398b293659cb78a84ff5fbff50892f3cb4b9cd3c6a60d17897fa5e063905a0c5
 DIST libnvidia-container-1.16.1.tar.gz 1610619 BLAKE2B dc490c1bcd891119841bb5c1aa0c1977f0f326118f7bc86adbab6a0053f52950e4ced5a4b025d6b557c1526e3125aa69ac47c10c621993becc5c40b13d6990c5 SHA512 b304c284c5ab0c3544362307dc16ffcca8d34497e4356a520dc6da81a86a62b2a262b528cba559bb0d7a3addf018c3b50b6cb78669c82c1b4acae159e5922548
+DIST libnvidia-container-1.17.0.tar.gz 1611953 BLAKE2B 7e0506b77790b4e079285990dec3486a8c0b482c9e9864dea1257b6250dc5371f6f3f2d8cd78ec4d73b09e45a7ac4cf31f8d03b64b96507319d433797aa5c435 SHA512 cdb3dba9033414211d5d41c623ef71cd7296be4e8f87a03afcb557fb27c3fa2212c55479cd3235f935426ca7b48e9d616753cbd9b85d38f7e8d1fa5208cc9419
 DIST libnvidia-container-nvidia-modprobe-550.54.14.tar.gz 47147 BLAKE2B 7b334877d98d0c75d5750192dea868436938852443ced14e74e59076ed4d8be9e361cdefbe48295d87bb91ac4565152ec3f3233479b3da19bb8baf8e7ef53cd6 SHA512 279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193

sys-libs/libnvidia-container/files/libnvidia-container-1.17.0-fix-makefile-r1.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/-/blob/main/fix-makefile.patch
+diff --git a/Makefile b/Makefile
+index 6fb6976..c6f26d3 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
+ 
+@@ -158,20 +156,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)
+@@ -222,22 +217,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 #####
+ 
+@@ -262,15 +249,9 @@ deps: $(LIB_RPC_SRCS) $(BUILD_DEFS)
+ ifeq ($(WITH_NVCGO), yes)
+ 	$(MAKE) -f $(MAKE_DIR)/nvcgo.mk DESTDIR=$(DEPS_DIR) MAJOR=$(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
+@@ -279,18 +260,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
+@@ -300,14 +281,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
+@@ -320,12 +299,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 3406222..339275f 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 eaee95a..7d5bd74 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 -o $(@) -ldflags "-s -w" -buildmode=c-shared .
++	export CGO_LDFLAGS="-Wl,--gc-sections -Wl,-soname,$(LIB_SONAME) $(CGO_LDFLAGS)"; \
++	$(GO) build -o $(@) -ldflags "$(GO_LDFLAGS)" -buildmode=c-shared .
+ 
+ install: $(OBJ_NAME)
+ 	$(INSTALL) -d -m 755 $(addprefix $(DESTDIR),$(libdir) $(includedir)/$(PKG_NAME))

sys-libs/libnvidia-container/libnvidia-container-1.14.6.ebuild

@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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
-		https://github.com/NVIDIA/nvidia-modprobe/archive/${NVMODV}.tar.gz -> ${PN}-nvidia-modprobe-${NVMODV}.tar.gz
-	"
-	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
-	NVMODS="${WORKDIR}/nvidia-modprobe-${NVMODV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-IUSE="doc static-libs"
-
-RDEPEND="
-	net-libs/libtirpc:=
-	sys-libs/libcap
-	sys-libs/libseccomp
-	virtual/libelf:=
-	x11-drivers/nvidia-drivers
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-build/bmake
-	dev-lang/go
-	net-libs/rpcsvc-proto
-	sys-apps/lsb-release
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.6-fix-makefile.patch
-)
-
-DOCS=( COPYING COPYING.LESSER LICENSE NOTICE README.md)
-
-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
-
-	default
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	export GOFLAGS="-mod=vendor"
-	IFS='_' read -r MY_LIB_VERSION MY_LIB_TAG <<< "${PV}"
-	emake \
-		CGO_CFLAGS="${CFLAGS}" \
-		CGO_LDFLAGS="${LDFLAGS}" \
-		GO_LDFLAGS="-compressdwarf=false -linkmode=external" \
-		REVISION="${PV}" \
-		LIB_VERSION="${MY_LIB_VERSION}" \
-		LIB_TAG="${MY_LIB_TAG}"
-}
-
-src_install() {
-	emake \
-		CGO_CFLAGS="${CFLAGS}" \
-		CGO_LDFLAGS="${LDFLAGS}" \
-		GO_LDFLAGS="-compressdwarf=false -linkmode=external" \
-		REVISION="${PV}" \
-		LIB_VERSION="${MY_LIB_VERSION}" \
-		LIB_TAG="${MY_LIB_TAG}" \
-		DESTDIR="${D}" \
-		install
-	# Install docs
-	if use doc ; then
-		einstalldocs # Bug 831705
-	fi
-	# Cleanup static libraries
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die # Bug 783984
-	fi
-}

sys-libs/libnvidia-container/libnvidia-container-1.17.0.ebuild

@@ -0,0 +1,123 @@
+# Copyright 1999-2024 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}
+	x11-drivers/nvidia-drivers
+"
+
+BDEPEND="
+	dev-lang/go
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.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
+
+	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 CC 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
+}

sys-libs/libnvidia-container/libnvidia-container-9999.ebuild

@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 # check the VERSION in libnvidia-container/mk/nvidia-modprobe.mk
 NVMODV="550.54.14"
 
@@ -26,20 +28,22 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-IUSE="doc static-libs"
+IUSE="+seccomp static-libs"
-
+# libtirpc
-RDEPEND="
+# 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
-	sys-libs/libseccomp
 	virtual/libelf:=
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="${DEPEND}
 	x11-drivers/nvidia-drivers
 "
 
-DEPEND="${RDEPEND}"
-
 BDEPEND="
-	dev-build/bmake
 	dev-lang/go
 	net-libs/rpcsvc-proto
 	sys-apps/lsb-release
@@ -47,10 +51,10 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.6-fix-makefile.patch
+	"${FILESDIR}/${PN}-1.17.0-fix-makefile-r1.patch"
 )
 
-DOCS=( COPYING COPYING.LESSER LICENSE NOTICE README.md)
+DOCS=( NOTICE README.md )
 
 src_unpack() {
 	default_src_unpack
@@ -71,27 +75,47 @@ src_prepare() {
 	default
 }
 
-src_compile() {
+src_configure() {
 	export GOPATH="${S}"
 	export GOFLAGS="-mod=vendor"
-	IFS='_' read -r MY_LIB_VERSION MY_LIB_TAG <<< "${PV}"
+	export CFLAGS="${CFLAGS}"
-	emake \
+	export LDFLAGS="${LDFLAGS}"
-		CGO_CFLAGS="${CFLAGS}" \
+	export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
-		CGO_LDFLAGS="${LDFLAGS}" \
+	export CGO_LDFLAGS="${CGO_LDFLAGS:-$LDFLAGS}"
+
+	tc-export CC 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 \
+	emake "${my_makeopts[@]}" DESTDIR="${D}" install
-		CGO_CFLAGS="${CFLAGS}" \
-		CGO_LDFLAGS="${LDFLAGS}" \
-		GO_LDFLAGS="-compressdwarf=false -linkmode=external" \
-		DESTDIR="${D}" \
-		install
 	# Install docs
-	if use doc ; then
+	einstalldocs # Bug 831705
-		einstalldocs # Bug 831705
-	fi
 	# Cleanup static libraries
 	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die # Bug 783984

www-apps/librarian/files/librarian.initd

@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="librarian"
-description="Private front-end for Odyssee"
-command=/usr/bin/librarian
-pidfile="/var/run/${RC_SVCNAME}.pid"
-command_user="librarian"
-command_background=true
-output_log="/var/log/librarian.log"
-error_log="${output_log}"
-
-start_pre() {
-	checkpath -fo librarian:librarian /var/log/librarian.log
-}

www-apps/librarian/metadata.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>benoit.dufour@mail.com</email>
-<name>Benoît Dufour</name>
-</maintainer>
-<upstream>
-<remote-id type="codeberg">librarian/librarian</remote-id>
-</upstream>
-</pkgmetadata>