Merge updates from master

7 files changed, 127 insertions, 56 deletions

diff --git a/app-containers/docker-credential-helpers/Manifest b/app-containers/docker-credential-helpers/Manifest
index 0eef5e2f8ddb..3f2764f397b8 100644
--- a/app-containers/docker-credential-helpers/Manifest
+++ b/app-containers/docker-credential-helpers/Manifest
@@ -1,2 +1 @@
-DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
 DIST docker-credential-helpers-0.8.2.tar.gz 283816 BLAKE2B 334ca059b619e5e3528864a99b07eea61b98083989aa8e8b619c83d781caad97fbf5f3ed60879adacf27d81e0b991a38567e1fa2bc27b9a772d86b51437a6e03 SHA512 ca04b7fe78871389c9f968b730c18e2aca2d2a818ce87c1f138efb7dafbfdea7b83c2c16504131d04c295428debee2187036e603dba711369b5de1a3993c2e8c
diff --git a/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
deleted file mode 100644
index e10a2730beea..000000000000
--- a/app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Suite of programs to use native stores to keep Docker credentials safe"
-HOMEPAGE="https://github.com/docker/docker-credential-helpers"
-EGO_PN=github.com/docker/docker-credential-helpers
-
-LICENSE="MIT"
-SLOT="0"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="amd64 arm64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-IUSE="keyring pass"
-REQUIRED_USE="|| ( keyring pass )"
-RESTRICT="test"
-
-DEPEND="keyring? ( app-crypt/libsecret )"
-RDEPEND="${DEPEND}
-	pass? ( app-admin/pass )
-"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local -x GOPATH="${WORKDIR}/${P}"
-	use keyring && emake secretservice
-	use pass && emake pass
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md MAINTAINERS README.md
-}
-
-pkg_postinst() {
-	if use keyring; then
-		elog "For keyring/kwallet add:\n"
-		elog '		"credStore": "secretservice"'"\n"
-	fi
-	if use pass; then
-		elog "For 'pass' add:\n"
-		elog '		"credStore": "pass"'"\n"
-	fi
-	elog "to your ~/.docker/config.json"
-}
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 764f0b2ef4db..d7a298d02061 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,2 +1,3 @@
 DIST cvs-fast-export-1.61.tar.gz 525785 BLAKE2B 64089fe0f99e247505152ad20c618a721917fabcf28e29ede330e89d9ffc3b05e314e09deb85c9c23de95acfa6193a6dd67636374862d58df231e06fd8313f09 SHA512 505a305b3f383a9df0f519ec0bbf92d5fbd2759b5be39b3eced898a00bd06290f2905e6add49c992ff69fdf468f6c83e15e8810bdf12d08eec0289aa7930df4e
 DIST cvs-fast-export-1.67.tar.gz 575386 BLAKE2B 080ca91d1002707dfc81d2d87373cb47b314b7f59dfb49081f4279b6d97ca43165d5dceb827e281deeae4d617bdec062475afb652b2680124c03455e155e9151 SHA512 193ae2a9ded2052d393891e0d847ca28a6b955fb17396d31c84265ff4336a9eb769d290fbdb645b7a528b17235e1a9a611d8b703977037229c001e6e46129445
+DIST cvs-fast-export-1.68.tar.gz 589722 BLAKE2B 2e904c60c7431a64afe24bfc8d57d8eb533d41c5905423a656f6ed2c3b6d0a646466941c94d002351c3b3bd336e3d846c3dba8cfd22f9256fd79d4db6f5dd64c SHA512 2e3eb1f305aa05320ba244cb34816dc3378caeb5bc0de6b2991f001f28d7eea7dc48d1bca297a38c934671a942be0bc810fc711aff8950461582a064d7a198d9
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.68.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.68.ebuild
new file mode 100644
index 000000000000..e5c66a2f9f9f
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.68.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # upstream does not ship some tests in tarball
+
+BDEPEND="dev-ruby/asciidoctor"
+
+PATCHES=( "${FILESDIR}/${PN}-1.68-Makefile.patch" )
+
+src_prepare() {
+	default
+	tc-export CC
+	export prefix="${EPREFIX}"/usr
+}
+
+src_compile() {
+	# '.adoc.html' rules can't be executed in parallel
+	# as they reuse the same 'docbook-xsl.css' file name.
+	emake -j1 html
+	# Allow full parallelism for the rest
+	emake
+}
+
+src_install() {
+	default
+	dodoc {NEWS,README,TODO,hacking,reporting-bugs}.adoc
+}
diff --git a/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.68-Makefile.patch b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.68-Makefile.patch
new file mode 100644
index 000000000000..e0f63c0c7d6c
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/files/cvs-fast-export-1.68-Makefile.patch
@@ -0,0 +1,20 @@
+--- cvs-fast-export-1.68/Makefile
++++ cvs-fast-export-1.68/Makefile
+@@ -38,7 +38,7 @@
+ GCC_WARNINGS1=-Wall -Wextra -Werror -Wpointer-arith -Wstrict-prototypes
+ GCC_WARNINGS3=-Wno-format-zero-length
+ GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3)
+-CFLAGS += $(GCC_WARNINGS)
++#CFLAGS += $(GCC_WARNINGS)
+ CPPFLAGS += -I.
+ #LIBS=-lrt
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
+@@ -70,7 +70,7 @@
+ # CFLAGS += -pg
+ # Warning: Using -O3 has been seen to cause core dumps on repositories with
+ # very long revision names - some bounds check gets optimized away. Don't do that.
+-CFLAGS += -O2
++#CFLAGS += -O2
+ # If your toolchain supports link time optimization this is a cheap speedup
+ # CFLAGS += -flto
+ # Bounds checks at runtime. Not enabled by default for performance reasons
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index f0ff44c43d7b..01f0b4ef29f6 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,2 +1,3 @@
 DIST Nikola-8.2.4.tar.gz 5635965 BLAKE2B 94421a278718fd9ae9f8978854954f2120bab005d10a52294b120d619a67455417eed94bb9e99cc9d01eca4e1d3da210980caef1ad7ff4ca5d25299a39d8eb19 SHA512 2bcea53181a5371fc1ce7d6d96e5db1ae0ab7c4bc8fe8947ed0d5427e71a469b0f522f1e6f20a47e51a3325730a9646156a8a57bab127785f220c65eb9f891ea
 DIST Nikola-8.3.0.tar.gz 4557992 BLAKE2B 67ab76c670fd00d992e6359bcaa11c59dfc904c78c935d1739e6ed7118e38c8f1c4590782a75e85c722f4fcb2c23efc032cb5d58d0c1587069b80920f3bd20fa SHA512 9b25eb90fa560b45e8cd0b03f24523859548353f2a4d2ac91b23b05bfb614d20456bb71f1aaa5702b6d6ab7980696aeb2f5ccc3c00ebc648cfcad49619481247
+DIST Nikola-8.3.1.tar.gz 4559433 BLAKE2B 32bffeaf5f490f6c7bdf48b1c3b1906e4fb9a94fb196ecba8f0c2f074489b05e57c4278ae6ec8a6d91838772d19ddb0444166e05caa4d0d3055bd388b9b8cc63 SHA512 cbf4e099e2e1ee22ab16c8a3d3984617097721cb24cf03cf9673fc89d051fa712a05cbbfb522f85d6808155a0fa8835b1630096691a33c25aee8cf24564df050
diff --git a/www-apps/nikola/nikola-8.3.1.ebuild b/www-apps/nikola/nikola-8.3.1.ebuild
new file mode 100644
index 000000000000..506e9eb20887
--- /dev/null
+++ b/www-apps/nikola/nikola-8.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1 optfeature pypi
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN^} ${PV})"
+S="${WORKDIR}/${P^}"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+RESTRICT="test" # needs coveralls
+
+BDEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${BDEPEND}
+	>=dev-python/babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/pyrss2gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-67.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	nikola tabcompletion --shell=bash > ${PN}.bashcomp || die
+	nikola tabcompletion --shell=zsh > ${PN}.zshcomp || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
+
+	newbashcomp ${PN}.bashcomp ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zshcomp _${PN}
+}
+
+pkg_postinst() {
+	optfeature "chart generation" dev-python/pygal
+	optfeature "hyphenation support" dev-python/pyphen
+	optfeature "notebook compilation and LESS support" dev-python/ipython
+	optfeature "alternative templating engine to Mako" dev-python/jinja2
+	optfeature "built-in web server support" dev-python/aiohttp
+	optfeature "monitoring file system events" dev-python/watchdog
+	optfeature "extracting metadata from web media links" dev-python/micawber
+}