6 files changed, 62 insertions, 98 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 870d1ae1ad3b..c1691b8db1ec 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 67c96e4b00b0..e8f463794910 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,8 +3,6 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 AUX kibana.initd-r1 1040 BLAKE2B 12fc93fcb8f79fc5013fab36eb74335a967f5573d7361dbfce78bde08d53e536eb63a068c047dad3c04e19b973b70d2af2b1e9757ebf9155951dea5c850d5783 SHA512 04cc2571d4c37cb7e270b1ef64e6fb26fa22d4ed259bc74eb165c8f2c49fb8ef9e1a3fbb0a7e45b04ed88309382429b2e78bdc5fe5cc51bf97ffcd5b17f387bf
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-7.17.7-linux-x86_64.tar.gz 264223742 BLAKE2B b433bbf080945ed5ded7862e5fb119a4672c5b5f6b58d6ae6bed8768ad1d8ed6435131c2174c39a18704bad75af150678056f30ae8046ebd1a9cd6737c04cbba SHA512 8d8250a73f3e6f208dfb02f9e1e19efed6c063bb50d6b802ab7b7e7f6d3c49dff287beb126b8663f02c7dbcff7936f7c27a79d441bc2e7e0e6b12ce521a85441
-DIST kibana-7.17.8-linux-x86_64.tar.gz 268709961 BLAKE2B 101ba07b492c1116566ba726154ecf6bc3360d6b30d042fd0f54690ec99ca1ae504e8f4df5b9661f52af2a6d98dd3556fe61b72bc69c02c963f6e40eb011612b SHA512 5220ce1fbaf8544c047e5caffa6abf43cd7f34f58408c9fbc9407b6feb0c34b8d22550f004b2ee90e1785ff2a47409626e4e8f32ee39391a5b7aa3f002f10c2b
-EBUILD kibana-bin-7.17.7.ebuild 2547 BLAKE2B 893c3739a0e210237a8944bfdde85f974df8d41ff86aed09dabf021eeb6b9613b0292ab8a85fa360c46491517f7e3b551ebad93ad0f7504683a5ab51e0806184 SHA512 25c00deaad89f4abb2109ae160c3d77b86b5808b6d505f580798257669f4b286967f54417965029ccbe58e8abdc3943e6a0bb403281aadbe8b55202c9bd91b4b
-EBUILD kibana-bin-7.17.8.ebuild 2547 BLAKE2B 2d2edf632782aa29a0485c85edc09a8834265d20892b03eb822275f27076a73b86711639b8e37d9dd66a42a61ea79b6a27209a2de5afc0f5babbdabbf2b303c6 SHA512 cf614d97469e3c9875b95a459a0a7636ded5f4e5292f619500856c795a65065644032a0b6d42841df99b318830a3e3dcdb27b8b9e777a7db43b2d23895e8cbc2
+DIST kibana-7.17.9-linux-x86_64.tar.gz 268769436 BLAKE2B 7c40aeaa407f879e364bf0b3472fb14794fc2e340545bc5099af1bdfad9d9977bf2ebdd4a30bd8e27e6ca7afc294b05486958176f6242a891c9f7676245fd0d0 SHA512 f0f9f65b6ba3cc401a519f764314854f6f1f22a9c3b55dfc5a4921455d64fc0d5b8352d267217076da82157553f235ab3d2506497132f23789b126205177e86b
+EBUILD kibana-bin-7.17.9.ebuild 2547 BLAKE2B 2d2edf632782aa29a0485c85edc09a8834265d20892b03eb822275f27076a73b86711639b8e37d9dd66a42a61ea79b6a27209a2de5afc0f5babbdabbf2b303c6 SHA512 cf614d97469e3c9875b95a459a0a7636ded5f4e5292f619500856c795a65065644032a0b6d42841df99b318830a3e3dcdb27b8b9e777a7db43b2d23895e8cbc2
 MISC metadata.xml 477 BLAKE2B 427185c252047ce2b2bbee8ddf2dbc9e59a6c701d3f0c6dec44158627d41f8266f8cedbba9b330c34bbc77335a5763598897fda097f6991a78f96ed9cce1f826 SHA512 6e158be025d255cf1a189bd02d4c9679aa96cc6b15985c321af0102498a760333fa82f4cc90aa3370820626c0d5478fb821eeef24c603d8dac82996447dc7c2c
diff --git a/www-apps/kibana-bin/kibana-bin-7.17.7.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.7.ebuild
deleted file mode 100644
index 366cfd12f858..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.17.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	>=net-libs/nodejs-16.13.0
-	<net-libs/nodejs-18
-	sys-libs/glibc
-"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-QA_PRESTRIPPED="
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
-	opt/kibana/node_modules/re2/build/Release/re2.node
-"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove unused directory
-	rm -r data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move plugins to /var/lib/kibana
-	rm -r plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d \
-		src/setup_node_env/no_transpilation_dist.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd-r1 ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 16. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.17.8.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.9.ebuild
index 819607376c5d..819607376c5d 100644
--- a/www-apps/kibana-bin/kibana-bin-7.17.8.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.17.9.ebuild
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index d4587337c4bc..b3f9affbdea3 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +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-RC1.tar.gz 23020112 BLAKE2B fc831b535614d1c9c725a40685a16e0acfc2c86938daecae3cace752f51184216415038d5a755686e087abb177f50fca881345ff120ed4113edc41c503e3d0de SHA512 a821fe458f99fc451c7150bc08b5f7800242a43a2757a3f9d7eccaddec3ffd5edfb8772b1dcb3d27e092c682f0d73c2712a1b366997881baae0d5e3d034597c5
 EBUILD wordpress-6.1.1.ebuild 1375 BLAKE2B 51bfb06b0eb9d1011ebae6c42bd4b6642d97f5f3f569fd93327159293b7018cd7c3da4b7e73678a29cd5ad280495530eed2011b1c69bbcb7b51d2547f8450af4 SHA512 e792c316897ebd99b74e08ff4356921a413b09404d25ec79a43196f2ac00e8c2c908ff3043917a8f8d68a00dba7d0f2cc39dfbf75173f5e75542aaba010b8e84
+EBUILD wordpress-6.2_rc1.ebuild 1408 BLAKE2B 3dd29d2988ecee0d5f0a3df7fdb8d01267ab6f33d7cdb633a1ca4428b869abae6ab73169f482a44a1859a09986bd9cee255477cbdf4c56d0efcccfbcc4636c12 SHA512 0a71c2d3889b5281e7c0752e79788376080778803370638c57ce117351a5875c3764ed2e208cb980efb3d658adb8c926fa8f49adf7a52e63c4818a4e461e4a11
 MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-6.2_rc1.ebuild b/www-apps/wordpress/wordpress-6.2_rc1.ebuild
new file mode 100644
index 000000000000..b6c209d75a8c
--- /dev/null
+++ b/www-apps/wordpress/wordpress-6.2_rc1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="GPL-2+"
+if [[ ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if use !akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if use !examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if use !themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	# allows plugins update if allowed within WP
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}