gentoo auto-resync : 29:01:2023 - 02:53:24

20 files changed, 122 insertions, 81 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 715f8a8928fa..248863f8b31b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 63502787cb26..d905402eece0 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -6,4 +6,4 @@ DIST agedu-20211129.tar.gz 92346 BLAKE2B 8e865ba5dbccd22aff82da715b7fd606c915e7f
 EBUILD agedu-20200617.ebuild 810 BLAKE2B 630a990f3002327d6581856e5b4146df7277ddbd631d798bbb8494cc2c501fa7906a69c4c555763231ad9896cf58418ae8b88b3bac2898daad1a09ad2627631f SHA512 07c26d320976498fde96dbd9b644abb1ad11f31220faf7c27434bfa3f324877177ea9800691294bfd944e0d9312611b5590f31c4d975836a8df0c02ad0c7df05
 EBUILD agedu-20200705.ebuild 810 BLAKE2B ae805dfc46890b17fced092675bedbcf9c8d06979b3f66b79832e72f544260cef2bd102a5aa49f13511ef62b05617ac90f9c0e48f5c7d46346d5b45099ca2ba5 SHA512 5ba38f2aad20d8fb0fe7f771864fffc70d71d44c7462cb17871ce85ddea2726b4ebfab3356914f1d2103c889132c0b9ce7604fdcfa0b9e8330379b45869c6715
 EBUILD agedu-20211129.ebuild 1079 BLAKE2B 47225ba0755212f92287ee919b024706ae35195e7dbb0707ab65b294aa1633438d1ca9f116456db18205da66f7d3f891fca5e7fbbb7a8e7d267b5df224a0c048 SHA512 bb8a072edaa6ebfca81bd1d1e1eccf043eed428bff8e3aa9dd57e8b710862eddb6eb493037e11be9b959c77c7e53e6f90a683d720686357d4c10dc9453404371
-MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-apps/agedu/metadata.xml b/sys-apps/agedu/metadata.xml
index 489e730c1c90..115e9d64a669 100644
--- a/sys-apps/agedu/metadata.xml
+++ b/sys-apps/agedu/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index d45ef354370d..009f89832cbc 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095
 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
-EBUILD baselayout-2.13.ebuild 12075 BLAKE2B 88a8a009340fbb0ff7d2097e3d84ffbab7d6e26fcc40b41b726bc917156ece802ff5c21ecb6c851844c6fe926b34fbfbbc71b6d4df93c4afdbef4c8ed402f7f9 SHA512 5797dc61cede904f3991602be25e3636c714ddc92ae654ea23bd604b6cfc55c040fa9d0098781b12157cb483a717b8241eb8b489e3233704b2175e22f912ed18
+EBUILD baselayout-2.13-r1.ebuild 11749 BLAKE2B 5b2653da9096b4ced9d68af19b0f5282389772478af5f70dff04a929b8102a4501f7dd9e080597156fe444b9afbf42a66741819d2b2a5747c3f993282f532935 SHA512 54e41d1cbd1b4928765c3d20ac2023fc2e70f3693ca43f435a86155a7ff6abc3bfad88bf7ec6c66d4c653d2aa468e0c546d3cb368c93bd7d27ff187868e19815
 EBUILD baselayout-2.9.ebuild 11818 BLAKE2B f60a5ccef7e0e77177dc2ad7e15048e3c83bf94981f7274264c0a9d18d2ac0a102456f2c06116a6e3f39bc01a3275d702c3bf7df64a3f81ee34ef744787da321 SHA512 2b07ce978ad790e0f97021af002731015f40291f8b881c08586c856011ebde4b0e4941d7fb557ba413e3c422023412f441803e5ce8860a39e27c7193b1f69537
-EBUILD baselayout-9999.ebuild 12182 BLAKE2B 5fe1fc77b11ed2a707ee2d17eb71a69b5043f0357acf04fbf2d3de200117c67846c56a5cd9b4fd11438dbdfa0459b53c9a12885d8d4619a12da7f66b35bc1d85 SHA512 16150e29d1ce45b2f86c73c68164a067069bd6d73808f26f593fe419e31e86c23e749d535dd10e412a43bef634b24a52c5c60cd5cb27e4b6e3611122453c60d4
+EBUILD baselayout-9999.ebuild 11749 BLAKE2B 5b2653da9096b4ced9d68af19b0f5282389772478af5f70dff04a929b8102a4501f7dd9e080597156fe444b9afbf42a66741819d2b2a5747c3f993282f532935 SHA512 54e41d1cbd1b4928765c3d20ac2023fc2e70f3693ca43f435a86155a7ff6abc3bfad88bf7ec6c66d4c653d2aa468e0c546d3cb368c93bd7d27ff187868e19815
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.13.ebuild b/sys-apps/baselayout/baselayout-2.13-r1.ebuild
index 97ceb30c3290..64d8126ed757 100644
--- a/sys-apps/baselayout/baselayout-2.13.ebuild
+++ b/sys-apps/baselayout/baselayout-2.13-r1.ebuild
@@ -192,11 +192,6 @@ multilib_layout() {
 }
 
 pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
 	# Also, we cannot reference $S as binpkg will break so we do this.
@@ -209,6 +204,16 @@ pkg_preinst() {
 		fi
 	fi
 	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+
+	# Create symlinks in pkg_preinst to avoid Portage collision check.
+	# Create the symlinks in ${ED} via dosym so that we own it.
+	# Only create the symlinks if it wont cause a conflict in ${EROOT}.
+	if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then
+		dosym ../run/lock /var/lock
+	fi
+	if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then
+		dosym ../run /var/run
+	fi
 }
 
 src_prepare() {
@@ -225,7 +230,7 @@ src_prepare() {
 
 	if use prefix; then
 		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/shells share.Linux/passwd
+		hprefixify etc/shells share/passwd
 		hprefixify -w '/PATH=/' etc/env.d/50baselayout
 		hprefixify -w 1 etc/env.d/50baselayout
 		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
@@ -306,12 +311,6 @@ pkg_postinst() {
 			chmod o-rwx "${EROOT}/etc/${x}" || die
 		fi
 	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
 	# whine about users that lack passwords #193541
 	if [[ -e "${EROOT}"/etc/shadow ]] ; then
 		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
@@ -365,12 +364,4 @@ pkg_postinst() {
 		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
 		ewarn "Please migrate your changes."
 	fi
-
-	# Restore /var/run and /var/lock if we just removed them from 2.11 or 2.12
-	if [[ ! -L ${EROOT}/var/run && ! -e ${EROOT}/var/run ]]; then
-		ln -s ../run "${EROOT}"/var/run
-	fi
-	if [[ ! -L ${EROOT}/var/lock && ! -e ${EROOT}/var/lock ]]; then
-		ln -s ../run/lock "${EROOT}"/var/lock
-	fi
 }
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 845f7f7a8dfb..64d8126ed757 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -21,19 +21,6 @@ IUSE="build +split-usr"
 
 RDEPEND="!sys-apps/baselayout-prefix"
 
-pkg_pretend() {
-	local stop=
-	if [[ ! -L ${EROOT}/var/run ]] && [[ -d ${EROOT}/var/run ]]; then
-		eerror "${EROOT}/var/run must be a symlink to ${EROOT}/run"
-		stop=1
-	fi
-	if [[ ! -L ${EROOT}/var/lock ]] && [[ -d ${EROOT}/var/lock ]]; then
-		eerror "${EROOT}/var/lock must be a symlink to ${EROOT}/run/lock"
-		stop=1
-	fi
-	[[ -z ${stop} ]] || die "please fix this before emerging baselayout"
-}
-
 pkg_setup() {
 	multilib_layout
 }
@@ -205,11 +192,6 @@ multilib_layout() {
 }
 
 pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
 	# Also, we cannot reference $S as binpkg will break so we do this.
@@ -222,6 +204,16 @@ pkg_preinst() {
 		fi
 	fi
 	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+
+	# Create symlinks in pkg_preinst to avoid Portage collision check.
+	# Create the symlinks in ${ED} via dosym so that we own it.
+	# Only create the symlinks if it wont cause a conflict in ${EROOT}.
+	if [[ -L ${EROOT}/var/lock || ! -e ${EROOT}/var/lock ]]; then
+		dosym ../run/lock /var/lock
+	fi
+	if [[ -L ${EROOT}/var/run || ! -e ${EROOT}/var/run ]]; then
+		dosym ../run /var/run
+	fi
 }
 
 src_prepare() {
@@ -238,7 +230,7 @@ src_prepare() {
 
 	if use prefix; then
 		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/shells share.Linux/passwd
+		hprefixify etc/shells share/passwd
 		hprefixify -w '/PATH=/' etc/env.d/50baselayout
 		hprefixify -w 1 etc/env.d/50baselayout
 		echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
@@ -319,12 +311,6 @@ pkg_postinst() {
 			chmod o-rwx "${EROOT}/etc/${x}" || die
 		fi
 	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
 	# whine about users that lack passwords #193541
 	if [[ -e "${EROOT}"/etc/shadow ]] ; then
 		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
diff --git a/sys-apps/fix-gnustack/Manifest b/sys-apps/fix-gnustack/Manifest
index 591dfbe4b728..65147042da99 100644
--- a/sys-apps/fix-gnustack/Manifest
+++ b/sys-apps/fix-gnustack/Manifest
@@ -4,4 +4,4 @@ AUX 0.1/0003-fix-gnustack-pass-Wl-z-execstack-for-tests-with-Clan.patch 858 BLAK
 DIST fix-gnustack-0.1.tar.bz2 105457 BLAKE2B 25825972d0a37335a6d6aec316e4dc972d6590da5d7d1145252b3fb4fbbf6276cc7818e47270065583558adf36522ea26652f8e7212a2046fc0d54c131ad5324 SHA512 df83beef5533003ceedda799bb27af15f877d2b3bc7c8213b2ac64a100270790655de3836eaa0ab8411d9eb91a6056e4902973b740b9b0791dcc5477226544a1
 EBUILD fix-gnustack-0.1-r1.ebuild 639 BLAKE2B faaa0d1361e85f616e65987a6e60825f0b50566c5d6839f29e37cbfe7f630ca14362451aba4007322308a7f3d98eefd73f729d6703150aa653dd469d712cfd4a SHA512 3749fc2405744fa89c87ed0382438e8edf06f7489f0f1724f67d039f83f9aaeaf86e4618fc6feb3261dd2829c728312cd0233b0e7c9d580115bde5ae7c1fc051
 EBUILD fix-gnustack-0.1.ebuild 443 BLAKE2B 6ff06d40ef5a3aa53e19b028b738c81a8029a13a7fca90d7728010f1ddcd91347988368ec37fd828419106832c91c36cc4c0835b7d16ccdeffc2b785e5c620d4 SHA512 26693f127e2c878cfa585afb46602b742c4c1bdbadc77243c7dfa11aa8fb52ff80bc2954641c8dcd378bfdd7050aa1cd3861a034d51dc2a327577ceb2b2ba808
-MISC metadata.xml 465 BLAKE2B dd1c394fa274793a675b48ee9d86936ea01a0a4f9ac277bfd6df4e737da3eacc31b0140a3bd6da2b032a77fdc5499a70e91a0a02a557698e4f4dab5483963141 SHA512 31167b524a7302d8458cd1fa932fd108609eadd88844f23ce28b13f7412a762894b5801ad54dff36db86c6e089f39e0db39f135704449492087ad3762fd8ce31
+MISC metadata.xml 385 BLAKE2B 3f88707b27b3adaeff24c719f474f1e04b8a369e9e407731f10a3ac99b716d914cf2a5e0d0b70951a90a8c385d41f4ca385d8a6d78c5847fccd00fa1e971240c SHA512 4f44f29bacea3b61019c02384bdb24fae1986b39e0a580843c1cdeeb8e305708bf888b0669f8ccec475972b5497b33abbeb9f6f962b390e86c361b3631ba8eb6
diff --git a/sys-apps/fix-gnustack/metadata.xml b/sys-apps/fix-gnustack/metadata.xml
index f1e4bd47573f..fd1dbcd3a21e 100644
--- a/sys-apps/fix-gnustack/metadata.xml
+++ b/sys-apps/fix-gnustack/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index a7ef62617958..65f4aef78e8b 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
 EBUILD gentoo-functions-0.17.ebuild 856 BLAKE2B 40d05ab5cd71c649b9081cd7dd21a3393195032e06374de5c7a11f4de6d0586c684d564f6d8a1b8338499b23c32921bd132ff5730c992e744da93a1a7c107e7c SHA512 185801a68b4649d1fdaac371c59fb6b7d838d5e1b975c2d89c3b166a745bc4a6c64f57345e5b6641608332f85b4b81c4e1d69e49a089b112f2e3d916831765c5
 EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 8198b175c1f6c5fd752e73800822de676f65c536d1d4076ea2192251bd998e067af9eaa33e791afa58f6ce9b1376e3a429bd48aef71decfbb780a339df9f8bc6 SHA512 deab8524211f355bf937258af93b555c4d919d45258f5181fa30a33fe70d34fcb20ed1dedc019c71fc65177419b9c2d1b3f72eca4fe69e86ad04817d3e39b589
-MISC metadata.xml 493 BLAKE2B c38d800838c6a17834b7783dd5e59ccd58ebaeefa7071f86a798105876bf2c4166157416c31f009d2edc2694b16f922e23f49a51c5d7e29739c536024f54a42f SHA512 4434fc898c5c895a1081535e5f6640001d81d4e2e1772df14541ab31ad3daed9cc34796348d8fc425af06a8d5a0779fa9f5fb6a4b02600dd73d314597ff7b59b
+MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index 3756aa057679..a228a51ef7ee 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -4,9 +4,6 @@
 <maintainer type="person">
 	<email>williamh@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-	<email>blueness@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 8e2adc7868f9..812a12dc1b9d 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -8,4 +8,4 @@ DIST haveged-1.9.18.tar.gz 495798 BLAKE2B 73e93fff2edfb39e4b5966fb9e1e631e073d9d
 EBUILD haveged-1.9.15.ebuild 1012 BLAKE2B 4984b1d33da747d0ac7cf62dd9bc11c420daaa2f9296069e44ad018c0c6e1ab9d7f5a7ee3fee3213a39316eeda3a2eec02f46f9cee743c38020e9323d752436f SHA512 8b47e4fbe680c208027eacb76365b216a74364dee285d1da024763138f80cdbdc0f1062f258b6254dcf0d3e0a9bb0a0f81d088b5ccccbd09a6112ae5d3f4015c
 EBUILD haveged-1.9.17.ebuild 1014 BLAKE2B 4c7dd2d5081373da83c554ce29c832c972d757b12e1d159cc233be2bee6cb04be96faa34d9f2d5181955b8b445b6bf3ce677ad050043bfe823edaf77ef6243af SHA512 0d9476169848e602575f529be08f6e1c9f61f8193c232d62ab803e7f2876a3f4ac94f8966aa1d7b595474fc849ea4f489747d3863bf40697a02013479cc33796
 EBUILD haveged-1.9.18.ebuild 1021 BLAKE2B 040b3cfd84bd20dd5ce93fa891f680518f6b5b1558252cefbe1621ad6769e144390069322182a44d1decec43e1a886297c441d43d632fb1cccba0eae9e7bf94b SHA512 35732010e9e5b3508dfbcb8bd365015059da5baaa560742ef9be20313451696f75a7be0ca9b10d2437eeeb26cf9f404dbc3a57d2116c3bdc6715ed21f2c29c8b
-MISC metadata.xml 453 BLAKE2B 8e0b710e55e214dd0dfeed4222fbfd8eeb4fd363a2d0e8f3c1d3ac401d7bb68a7d608f5629f06fe46b2d368e221772a63a03641c6aa8c6e62b21aa0ed2ca2960 SHA512 46efe891a245b81f9d872fe8be2cf62beb8a7e39659ab6929f52a4936deb8e9b66c52d7575b741a1ddf3d158ce5ca1b1df8b3c6ffee97b15effc5b4ba8c4c23f
+MISC metadata.xml 340 BLAKE2B c3df6d75bd9be4efa4cd33c869af3eae446b5fd68991d4909825fe5d9635c286487e93036de49cc16ee6fbe924e03aef1547f4e74deaa35841ffe38b330cb66e SHA512 29814a556c3419e72fcfbc4c901c68678b36f0abf752f9e5df33850715b4f7254dc8f7c243a208774f939f9d6e33e56a1436a9fff059309f7944a83905a2777b
diff --git a/sys-apps/haveged/metadata.xml b/sys-apps/haveged/metadata.xml
index 8ab99b65a4f8..62ccdfb2e8cb 100644
--- a/sys-apps/haveged/metadata.xml
+++ b/sys-apps/haveged/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
 		<name>Gentoo Sysadmin Project</name>
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index e3fd88c4b78c..001f59f6afe8 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -4,4 +4,4 @@ DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543
 EBUILD install-xattr-0.8-r1.ebuild 1018 BLAKE2B 7c3d247e86156a8f3fcf50556070d45e254632093be8d7dbe0f8c95b9b80ecde112dfd3d0dfc7beec6171ab8e23675fd27eba8e5f6e988e95cb993f9bbd1d7e8 SHA512 c483f8eb22102de8c875e58d3a7bb7e1e533ef4e1bfd382278597eb1aa649d5c5d45678203393077db3cfe30f0eef8f2ffe494f959ec71255a8d7c8c975b2a15
 EBUILD install-xattr-0.8.ebuild 1006 BLAKE2B ed568765285654f323b5d38b324c0da6c2cabf2c450c2fc7d9a31dec5a876adcb0275de1448c80bbce4619d259f6dd95e4aad376f196d2a41a97072ac345275e SHA512 0819e998357e972c89dfcb7257e155348df4aa854cbcfc4dfea01f4411ca8c1a607c0f14a1e8c55a676210d0b639935b6eaeca2c9ae0e0edb5d069614acf9506
 EBUILD install-xattr-9999.ebuild 971 BLAKE2B e9725d58e099850e6ca3b151e23a258c7dc680d115a7ec9be86edbac32cf3d5e4875713383da9438e7d3ce15a25d80560042c2c816ed9503dcd7004ebe34bc4c SHA512 94a6020f4baa8a123f2d97393fc5c2d55226211427f2d7f220f77cb1d713ad6c9d1aa7413cd137542bbc7308909d8686aa95a9e2b91ae294475078d815257b68
-MISC metadata.xml 331 BLAKE2B e3b7ee18d397a8cf60b49d5c4eca33441306f8fcc993db82f5448ff157e0a2fbaf2c68aad458ee7fedec0bc88d0227ef179303b413e016f99b37da250e065226 SHA512 cf38b01cf7b8c471b1983a1906a95bbf1f492f4a94e4d8beb7802b72f9ad3ee365efd4971f16301acc0bb5ca8786ed5346cb218300ed12ddf4d1b98cbb77cadf
+MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/install-xattr/metadata.xml b/sys-apps/install-xattr/metadata.xml
index 6b9d80dae3c1..73dda144f9ac 100644
--- a/sys-apps/install-xattr/metadata.xml
+++ b/sys-apps/install-xattr/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>blueness@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index bac019d624cc..04e1d74d23b0 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,3 +1,3 @@
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
 EBUILD paxctl-0.9.ebuild 748 BLAKE2B 2546954ffead8a10c251c3a6f3b3df5b719cc7be1d03a1b12c1670a68e1b9c10e884b442d052be7915990b55271edab7a784155b3f709c685c22210ad5bca720 SHA512 ae658edca2cbbd884558e08b57c44c8a939dbfa93afa8076a02ce064798cc5a67413949ae46303941d958dda839f77fc3430a492b2ca858df5de359d9bffdbf5
-MISC metadata.xml 364 BLAKE2B eeb95b7d41e5b45591bb8ce1514cc3302fa4ca9f6c2f3b461cce09ef979d63f17f0e80378d905d89fb55979f19e9c8f10524294d64389ddb40404c74aac79623 SHA512 21f9858b9b75136e2348a4f9822051c7180442e29d0b5f3b4352d90ef45e043bfbfb33456f32bbe69d8e31d3fc6f1935789b8f58cd3e6de2a568fd279b9764a7
+MISC metadata.xml 252 BLAKE2B 77d0ee5309919adedac9caf60e48d1feea156ab00e03740fc83282b32e3424e66a9e49c3736b6e186143373653d99cb43baca8a876b9601720583693af3d43f7 SHA512 0638df454dd637421d42dd06154095824d66a1e08c5160ab406bfa45dd414d3330a5181a1d0127bee99eb56c125832b68b4ea1c1ee8da54e4929a1748070f435
diff --git a/sys-apps/paxctl/metadata.xml b/sys-apps/paxctl/metadata.xml
index 8754f15c5ffe..3e45e0f6b901 100644
--- a/sys-apps/paxctl/metadata.xml
+++ b/sys-apps/paxctl/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
 		<name>Gentoo Hardened</name>
 	</maintainer>
diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest
index 9d5b266f8890..bcc63bca23b5 100644
--- a/sys-apps/paxctld/Manifest
+++ b/sys-apps/paxctld/Manifest
@@ -2,4 +2,4 @@ DIST paxctld_1.2.3.orig.tar.gz 17174 BLAKE2B 6f288b039f719febf2f3370a0d245c07928
 DIST paxctld_1.2.5.orig.tar.gz 18694 BLAKE2B 9d219846bbdfc5d709d9fb3758ec9451bef1545d6bb25263aef1c42f992f4201e2ce9f9cae0a77ed7584ec5c3c6dd0e3d0c58ec251a52f0b855c87b0fcf0e826 SHA512 c38b2cb0bf07d0075fa01f95d82adf6aae6e7bd010fa31b349af7c92b0498bf3225344500ef306bb633caec0b642771f453a8445cadbf342775931495d0ef2c2
 EBUILD paxctld-1.2.3.ebuild 732 BLAKE2B 82b12a6b32f17b7aa0110f7acf4349da0d8acf260a4bab7b2cc5ace30c449d960482fb63649f697df71626d13530e93b4cc10e50d50942cbb76b163d67e391a0 SHA512 e2a6674deb0720e2ceb67a8e52c72c93c33cc2eb7237f08fa682322b7b3f3a5282a0f020b45654376eab4bd042ff36eaab4be5204e9b60160236619f71836ca4
 EBUILD paxctld-1.2.5.ebuild 732 BLAKE2B b0c1a4bc809bf1e6c08b284addabfc974eb6bbbae0786b9cc5f018c66a7f727329f35eab6846f412b8968892144fb706f61283c8905304270c8205399e6cb391 SHA512 43d1065c3fe84e8427c8bbf29edc0f3367eaf8a60076299395d2b9f50736e4239a2f99c7c2aa7f5bb2224c191f648bac4b2acafc2e0fa8dc9aa20020f27ebef2
-MISC metadata.xml 364 BLAKE2B eeb95b7d41e5b45591bb8ce1514cc3302fa4ca9f6c2f3b461cce09ef979d63f17f0e80378d905d89fb55979f19e9c8f10524294d64389ddb40404c74aac79623 SHA512 21f9858b9b75136e2348a4f9822051c7180442e29d0b5f3b4352d90ef45e043bfbfb33456f32bbe69d8e31d3fc6f1935789b8f58cd3e6de2a568fd279b9764a7
+MISC metadata.xml 252 BLAKE2B 77d0ee5309919adedac9caf60e48d1feea156ab00e03740fc83282b32e3424e66a9e49c3736b6e186143373653d99cb43baca8a876b9601720583693af3d43f7 SHA512 0638df454dd637421d42dd06154095824d66a1e08c5160ab406bfa45dd414d3330a5181a1d0127bee99eb56c125832b68b4ea1c1ee8da54e4929a1748070f435
diff --git a/sys-apps/paxctld/metadata.xml b/sys-apps/paxctld/metadata.xml
index 8754f15c5ffe..3e45e0f6b901 100644
--- a/sys-apps/paxctld/metadata.xml
+++ b/sys-apps/paxctld/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>hardened@gentoo.org</email>
 		<name>Gentoo Hardened</name>
 	</maintainer>
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 84de85221460..b94cf773bfca 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -3,5 +3,7 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST plocate-1.1.17.tar.gz 73528 BLAKE2B b5694c3669a9717a9410093b1fba2eef029550989ffcbf9b6e7b48cc715c215b909c140cd98d47d30d31ccb6e04fd54e9b565bc8e16c1d9901ccf82a906de311 SHA512 36fa7ad01b5136ce75aad56d154cac511f2f4952a52ef2f16143e46b65a8b129e9011dbdd66d80a0288ef15291864cef0e51d26181b966a2f67b5e4f9fc42c7d
+DIST plocate-1.1.18.tar.gz 73906 BLAKE2B 60f11df992c2865259c2c9cfda033b1b303738c19cc7ffa8a885bbc6fd26140263c7fe31acb2541fe9b298034d28a719935580561c7d4e88c564fa0e74eeccbe SHA512 da059980472df2269139a5b71d34579e239365714d54dfa2af68276c6e28178602eda302d2ec39cb7e5e07312019425159048047ddfc08bd3266e3bf7972d1c6
 EBUILD plocate-1.1.17.ebuild 2195 BLAKE2B 990070bd488c31df7be758e359f092a52701b76846a3ccd009b6d95ac686936af6e05bce7ee04dac945f8237d8035ba836040609912ce31569e22bc7c26e4da0 SHA512 3d0416e8ed8e6ce74e7518a11076c7cfb64ccd15c0d7cf67462d6643420753671812dc834652bedd56e79e4383ebfa8dfdfdacc9b1f1bc8cdccee4bf16be9b47
+EBUILD plocate-1.1.18.ebuild 2196 BLAKE2B c225c730c52b6a052dd8043f4008306672bfe4d297f9b5c13409427ae64a154803594df968dbc0f8813f230c9350fb2cdb89f294e8d0b5e56ca9ec49df33629b SHA512 8f46d0e1ffaf18db4c240408e8566cb99b29749e413ccc8db1d7f9fc1a939988c35e7dd7411f0baa1556b10a0901f60448a602f6b70122e21297cc94dd126222
 MISC metadata.xml 1424 BLAKE2B c0120cd8ebfe537535ef4c9d1c0af50782a8f70f5be649ea732d7196fa7c04cb3cd5eb88635ad1d8296a16ff0eaacce402024f3dd921b1b0d0aa5512f4ffe692 SHA512 633c882489bd93a3c5f1fce385e7957589e99e58185ff751fe2f0e06a49a82f6cafc9a0b490a7dbb3a3761d24904f9e360b53369b341cb65b2a58dac28e5d0e8
diff --git a/sys-apps/plocate/plocate-1.1.18.ebuild b/sys-apps/plocate/plocate-1.1.18.ebuild
new file mode 100644
index 000000000000..d232fce2fe29
--- /dev/null
+++ b/sys-apps/plocate/plocate-1.1.18.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Posting locate is a much faster locate"
+HOMEPAGE="https://plocate.sesse.net/"
+SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
+
+# GPL-2 for updatedb
+# GPL-2+ for plocate itself
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+io-uring"
+
+RDEPEND="
+	acct-group/locate
+	app-arch/zstd:=
+	io-uring? ( sys-libs/liburing:= )
+	!sys-apps/mlocate
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch
+)
+
+pkg_setup() {
+	if use io-uring && linux_config_exists; then
+		if ! linux_chkconfig_present IO_URING; then
+			ewarn "CONFIG_IO_URING must be enabled for USE=io-uring"
+		fi
+	fi
+}
+
+src_prepare() {
+	# We'll install the manpage ourself to locate.1
+	sed -i "/install_man('plocate.1')/d" meson.build || die
+
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlocategroup=locate
+		-Dinstall_systemd=true
+		-Dinstall_cron=false
+		-Dsystemunitdir="$(systemd_get_systemunitdir)"
+		"$(meson_feature io-uring use_libiouring)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc README NEWS
+	newman "${S}"/${PN}.1 locate.1
+	dosym plocate /usr/bin/locate
+
+	insinto /etc
+	doins "${FILESDIR}"/updatedb.conf
+	doins "${FILESDIR}"/plocate-cron.conf
+	fperms 0644 /etc/{updatedb,plocate-cron}.conf
+
+	insinto /etc/cron.daily
+	# Ensure that the cron file has the same name as the
+	# systemd-timer, to avoid plocate being run twice daily on systems
+	# with a systemd compatiblity layer. See also bug #780351.
+	newins "${FILESDIR}"/plocate.cron plocate-updatedb
+	fperms 0755 /etc/cron.daily/plocate-updatedb
+
+	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "The database for the locate command is generated daily by a cron job,"
+		elog "if you install for the first time you can run the updatedb command manually now."
+		elog
+		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
+		elog "please customize it to your system requirements."
+	fi
+}