gentoo auto-resync : 30:03:2023 - 09:57:51

6 files changed, 2 insertions, 116 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index b178c0846772..fccf7449ab7b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 98dc8b6703e5..8972091da769 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,7 +1,4 @@
-AUX nikola-8.2.2-markdown-3.4.patch 1716 BLAKE2B a1fbf6f2eb5adf49a064f09d4b521aa49d0323da2c96ad4d5e0a2671d2ae41c1f9a9fb5cac57f6260bbfacb97c04627e04ba6619dbeee83badcd51dca8b774bd SHA512 7372b620354f6e082087f7a60e81f7e3690bea4f8fbe2af0a83f38150a975ab6e24c115418c0212a6e8d7968de421af99ee1d1754ca35452cdd47fe6d6212e0a
-DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
 DIST Nikola-8.2.3.tar.gz 5486641 BLAKE2B 690ea8584b9b11b1f26b768dc6daaded2f976b54a7be3b75f83d50cda3721f3f0051fd7ff7be3c38ed871ac905f604f891936e4ea72381b8f88a461f4d227587 SHA512 fbb107f975a4eeb369469eaa7a83e6fd342202530f91a0428c854f2eca28315268d6623983a078496943878a9f0548a5939184a2349d468cc0ac7152116b48b4
-EBUILD nikola-8.2.2-r2.ebuild 2135 BLAKE2B 86c362087df27d52012058089dc1947fd71860c6dc2da3ff7ad3cc8e29ed6c13299d85f5bd8476d7f6e2bc67884bd5df995f40d80477884787d5e490a5c8d208 SHA512 3b9916fd96c67cf989b4b8d244aac06daeb39ae1e952416a5bc06ca61644cb36d3eb6300df1a19796c4c3f632316a14b01d7c3409c2c8789027e277141818b11
 EBUILD nikola-8.2.3-r1.ebuild 2098 BLAKE2B edd3a86599d2fc9e52b5d9314b2c16e3ece246336d37daad1af9068d41369740612a1e4d0916f5dc52d36fdbd4a8af1afb2c1a0719a8dba64ddd150b4a1304f5 SHA512 fa747390a24a07f674055d38cdb2b14f99d40bc51f139c33aa3c4f677c3deb127a5266377cc6a2c7bc30dc391c11eede25fec849f4f3deab0da7b64bbd807c46
 EBUILD nikola-8.2.3-r2.ebuild 2363 BLAKE2B 1c060dbc1ec34ced2824a2d23e7f0679f96cbd08a2895d44a897cdc5bd2260ab30766542277ab87b233087955520aac9d3c6912e63489aad6bb0090a49a088f9 SHA512 dff607dc0e5e971ac0b31654245307483ca14d4bfc13e719e1f3fa61b3299ba8478700927031e2398cd82b3d56cc472e32bb3fc8ea1121cd25b886d3be47b274
 MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch b/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch
deleted file mode 100644
index a1f54773f65c..000000000000
--- a/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/860087
-
-Patch backported from upstream:
-
-commit 1be6e8b387bbebcc891b0afc53802cf69607cfcf
-Author: Chris Warrick <kwpolska@gmail.com>
-Date:   Sun Jul 17 00:08:24 2022 +0200
-
-    Fix #3635 — fix compatibility of Markdown extensions with Markdown 3.4+
-
---- Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_gist.py
-+++ Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_gist.py
-@@ -76,6 +76,7 @@
- """
- 
- import requests
-+import xml.etree.ElementTree as etree
- 
- from nikola.plugin_categories import MarkdownExtension
- from nikola.utils import get_logger
-@@ -84,11 +85,10 @@
-     from markdown.extensions import Extension
-     from markdown.inlinepatterns import Pattern
-     from markdown.util import AtomicString
--    from markdown.util import etree
- except ImportError:
-     # No need to catch this, if you try to use this without Markdown,
-     # the markdown compiler will fail first
--    Extension = Pattern = object
-+    Extension = Pattern = AtomicString = object
- 
- 
- LOGGER = get_logger('compile_markdown.mdx_gist')
---- Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_podcast.py
-+++ Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_podcast.py
-@@ -36,11 +36,12 @@
- <p><audio controls=""><source src="https://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3" type="audio/mpeg"></source></audio></p>
- """
- 
-+import xml.etree.ElementTree as etree
-+
- from nikola.plugin_categories import MarkdownExtension
- try:
-     from markdown.extensions import Extension
-     from markdown.inlinepatterns import Pattern
--    from markdown.util import etree
- except ImportError:
-     # No need to catch this, if you try to use this without Markdown,
-     # the markdown compiler will fail first
diff --git a/www-apps/nikola/nikola-8.2.2-r2.ebuild b/www-apps/nikola/nikola-8.2.2-r2.ebuild
deleted file mode 100644
index 4285f876880a..000000000000
--- a/www-apps/nikola/nikola-8.2.2-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-MY_PN="Nikola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-RESTRICT="test" # needs coveralls
-
-DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=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/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}]"
-
-PATCHES=( "${FILESDIR}"/${P}-markdown-3.4.patch )
-
-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
-}
-
-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/jinja
-	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
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index de7bea707f71..60824b781d95 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,7 +1,7 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
 DIST wordpress-6.1.1.tar.gz 22751086 BLAKE2B fbbee51219e4237236c39255deb9e31e566c630cfc66f0c4744fec249ae1d07473a6222b7ec5d84079e616d8d2e790521e57809d357ab56582b4a292dbad82f1 SHA512 b50dd9b5e1628a0285d3f0121d6b4cb3617fb696907ef06c935b40d0a46c9853ce12200e011a58675830602aa6d5b6470a98e8cefeec0f7464145bdc344780bb
-DIST wordpress-6.2-RC3.tar.gz 23018903 BLAKE2B 268299759a2a412f60d33162a54f677acb424100417bca7e207be5d5e5fb9a230f3a9f6db1039f93ea0513fe4be3f5622b46a1f598b56af08bb4185c56e6103d SHA512 925a3456a61655035d0162a5051307336b6e586aca216a45cc17239266c6e6288924ff6610409d20759bf083c36619e77335852b67ab302d9892cacd2d6dec17
+DIST wordpress-6.2.tar.gz 23018887 BLAKE2B 796a0e5c07c8628fbb6406f79b31123f4328f628b8814b02d506f4aed7217ccc5fc07aff3f441be0f1aa55fe8b9a4c184b2b5d0ed0892f1dedddab101632a70d SHA512 207e2d7aad658772f33c91ed37440b06029de7977847efde5ccd6b4687e7430f3f1a6d9e6d40d1b09d0565ed12adc1e25dc4f34a0102aae2899ef9a8ef8b3baf
 EBUILD wordpress-6.1.1.ebuild 1375 BLAKE2B 51bfb06b0eb9d1011ebae6c42bd4b6642d97f5f3f569fd93327159293b7018cd7c3da4b7e73678a29cd5ad280495530eed2011b1c69bbcb7b51d2547f8450af4 SHA512 e792c316897ebd99b74e08ff4356921a413b09404d25ec79a43196f2ac00e8c2c908ff3043917a8f8d68a00dba7d0f2cc39dfbf75173f5e75542aaba010b8e84
-EBUILD wordpress-6.2_rc3.ebuild 1408 BLAKE2B 3dd29d2988ecee0d5f0a3df7fdb8d01267ab6f33d7cdb633a1ca4428b869abae6ab73169f482a44a1859a09986bd9cee255477cbdf4c56d0efcccfbcc4636c12 SHA512 0a71c2d3889b5281e7c0752e79788376080778803370638c57ce117351a5875c3764ed2e208cb980efb3d658adb8c926fa8f49adf7a52e63c4818a4e461e4a11
+EBUILD wordpress-6.2.ebuild 1408 BLAKE2B 3dd29d2988ecee0d5f0a3df7fdb8d01267ab6f33d7cdb633a1ca4428b869abae6ab73169f482a44a1859a09986bd9cee255477cbdf4c56d0efcccfbcc4636c12 SHA512 0a71c2d3889b5281e7c0752e79788376080778803370638c57ce117351a5875c3764ed2e208cb980efb3d658adb8c926fa8f49adf7a52e63c4818a4e461e4a11
 MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-6.2_rc3.ebuild b/www-apps/wordpress/wordpress-6.2.ebuild
index b6c209d75a8c..b6c209d75a8c 100644
--- a/www-apps/wordpress/wordpress-6.2_rc3.ebuild
+++ b/www-apps/wordpress/wordpress-6.2.ebuild