gentoo auto-resync : 13:04:2025 - 08:44:57

4 files changed, 4 insertions, 73 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index b423e476bc01..53a3e260d2ff 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 139862345750..e48518ee00c2 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1,3 @@
 DIST Nikola-8.3.1.tar.gz 4559433 BLAKE2B 32bffeaf5f490f6c7bdf48b1c3b1906e4fb9a94fb196ecba8f0c2f074489b05e57c4278ae6ec8a6d91838772d19ddb0444166e05caa4d0d3055bd388b9b8cc63 SHA512 cbf4e099e2e1ee22ab16c8a3d3984617097721cb24cf03cf9673fc89d051fa712a05cbbfb522f85d6808155a0fa8835b1630096691a33c25aee8cf24564df050
-EBUILD nikola-8.3.1-r1.ebuild 2368 BLAKE2B 6322d893f5077e885e4051e91e53a90f62cef30428a705516424f0d33cd39af1697c3c5eabe06dd81f0a93ddb80c3efc47989ccc8b550045da639dd9111ada21 SHA512 54d84ef90b48a396e109253dff37389989eb77528c1f77036db49eedfcd83b7242ab48cd5db0e4190a998754475e2cb31fe9250eebbdb2a976946669a49e29e6
-EBUILD nikola-8.3.1.ebuild 2364 BLAKE2B b018a8cf8260d263fbdaf0c69ccd93ce13ec9247fcd8af8ef5577f59e8b43f72fba8198fe9babb5b652fa10965850b7a8b3ca40a0fe230732be381bf589d28e8 SHA512 42c9d8f47676440ff07b46cf8b9d9a3f1cdd89df348474971cbee03cf85c57def4c5fca7c3ce95d171feb817dc8a77df8f21bf5b48cf5b97a6ac51a8dec2a9c9
+EBUILD nikola-8.3.1-r1.ebuild 2330 BLAKE2B a85f4a064128852221bc20acad252c4632ae9a779f6f66f0e2a28f0300f7aad46938a2f79d3e06c256ed8061fac0ff963422359ce659de3ff71a13b92378a4f7 SHA512 b2a24068f837579b3d1b4d1f3fd986ff43ffc3fbe24d5d87631a3f897e62ad1b7f8a50d4a14acf7536b7f1a0abde5bca1b1e2967ab02eb988f981a569143360b
 MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/nikola-8.3.1-r1.ebuild b/www-apps/nikola/nikola-8.3.1-r1.ebuild
index d78629dd0c4c..28637f25f1b0 100644
--- a/www-apps/nikola/nikola-8.3.1-r1.ebuild
+++ b/www-apps/nikola/nikola-8.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10,11,12,13} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit bash-completion-r1 distutils-r1 optfeature pypi
+inherit distutils-r1 optfeature pypi shell-completion
 
 DESCRIPTION="A static website and blog generator"
 HOMEPAGE="https://getnikola.com/"
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 RESTRICT="test" # needs coveralls
 
 BDEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
@@ -52,8 +52,7 @@ src_install() {
 	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
 
 	newbashcomp ${PN}.bashcomp ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zshcomp _${PN}
+	newzshcomp ${PN}.zshcomp _${PN}
 }
 
 pkg_postinst() {
diff --git a/www-apps/nikola/nikola-8.3.1.ebuild b/www-apps/nikola/nikola-8.3.1.ebuild
deleted file mode 100644
index c6f4a23a0f67..000000000000
--- a/www-apps/nikola/nikola-8.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-}