gentoo auto-resync : 01:12:2022 - 20:53:45

21 files changed, 453 insertions, 62 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0e0092363c4e..49c4200c48fc 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 18ddf36d89ed..45af9d9bed41 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,6 +7,6 @@ DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca98556807196607829
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B 37f5e49a8d45706ea17779f841523c5f876f29cd9d9d2c88dea33136b249c89853dcea87417f7e4b8c040e9a4b7d1691704301d11116baa567c0cb2b9fa0e17e SHA512 5e2b09e5e4fdb4c34aa0c75b8fbb6aadba98d93063aaf6eff01854e1a1527b9757c73ce35b8da17fe3eb480e04bff88d445305d95ad248bc9461723a9699e33c
-EBUILD coreutils-9.1-r1.ebuild 7039 BLAKE2B d5b2ff8ec9f7f6d723386f37767afdcaaefe05bbd8638f2bd5e4161b386f6e41cb10eda8a60147ef412d6a3d393089f87c90494a6dbb397d1156224d80b7b7d2 SHA512 8d916f9b3a7b5c97f75a5a3245cd1e936618487838b72dd069a07a7d32c6ede574a37948790ee4bf833251951eb3d4b68d3bf8dde3605620dd9453cd18ff19b9
+EBUILD coreutils-9.1-r1.ebuild 7038 BLAKE2B e15621dc1bdcf4d8c5395661d822ec9dd8a500d782a4adc8165813a550937d3ac30f6cd0caadf2011f9388376335a84a908afe66a9341484da254290b4d4a1a7 SHA512 9bf52d2f3aaade1024556d699ec6abc05f1ba6ba94466eedf6c3b23a04b8b5864202571f8279993a77bf252920200b4bdb04a52bd4a103023aca82d656bf1c54
 EBUILD coreutils-9.1-r2.ebuild 7122 BLAKE2B c39d3e7237b1e700d3ae55413073714181fee3f5877cb63694746a6e7d1a3c9d16c6cd0eabe4186746a5dd6a7d4795ade28e5327296f79917ca933cdc3b5bc75 SHA512 8b4750259b70625f301fc689a0939fa642d5b23cc87739ec1d160c980e65690cc795cddaca879217dd9bd4fc08de0a451b94032614194411cd865852cb4306c7
 MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119
diff --git a/sys-apps/coreutils/coreutils-9.1-r1.ebuild b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
index 8c53dea0990e..ccda6e144e75 100644
--- a/sys-apps/coreutils/coreutils-9.1-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
@@ -26,7 +26,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index 4f1a22a5c1f2..b13830fde356 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,6 +1,4 @@
 AUX lsvpd-1.7.14-bashisms.patch 1402 BLAKE2B e6c59a9536231e7916ccd44842e927f39c9d544350507495ccc58a184529da52c37ae7429d546b519a932dc1a736e798096faed70f3d252b392b5c86867ac494 SHA512 199824e3e30ee9504b4d9d97d3ff6c8df637177b91f8e311118c1df8dad21b8bf624e48b01316453ddfb9ac92767083c66eb3524100ea6c0889394f84aab6106
-DIST lsvpd-1.7.13.tar.gz 93269 BLAKE2B 9b92de69b810314dd8c84e300fabcce2117b16373b68c7e414cd6035f1b64f90fec2e2c4f0b623263d0f7de1e499464139e7b8ffa30e2e13b76fce50ea67ff4c SHA512 99039b622051a24d1d17a014a81c6909a403c4b3746c2e4e62b0822f1d14319b3fcd5c82c13ec240ef2110c8a08de5b74a39ed0dea8a482977a475566cd83d3b
 DIST lsvpd-1.7.14.tar.gz 93419 BLAKE2B a79706993678b5732896141017ade419fe4ffb15cae0c8c68d8f9e64ce7d4f007a5f5d80b1e6c0935e23f41641f95ee1becdacb1515b34278eb7d7cc23df129b SHA512 f9c507db1e5e16adeccf50ce94a0bb891e4907724ed36da88fa94cdca11436124dc6615b3c9287a1a26ee1beb51a0d3c203c58b15e7bcf9a4338087ae4ff8018
-EBUILD lsvpd-1.7.13-r1.ebuild 599 BLAKE2B cd957f7eec4975eb3bb501b96996c592aebe6d0ae665274ad5e2738d0ed94b6b6a95150bd2c442877743dd89de5c6a78ac19700f7765b1682fc1762a688f65e1 SHA512 aa6b35fbcc109bb504dd4f755c2ee233122c5dd5b57395112fc68873a87722939fcd78b4ad81fb2b8af994bfffdce2aedaa5ddf1bd5d53497378b605e54a9ce0
 EBUILD lsvpd-1.7.14.ebuild 664 BLAKE2B 5a7b071574d2c7264eee59a92bad6cda62f4e286040d2955f1f9eac568ae30fa68d3e63cc2f31cecb337438cce36491f6034a933a5f790b62ef64ce6b493cdd9 SHA512 052b5d6e2e27b1fd7bbfcd8ef09a4644c048076da1fcdbe1fc7dc15e5e4733808977da7050082f223a2a0b8ceba837f09b6d3138bc76560b85c6ab2d009029be
 MISC metadata.xml 1064 BLAKE2B 687dde612ef81363b00a449b98bb9bb198140bd40e94f5388cba0b3b14247433ca40657267ef0f797a8cb54481f6d7e9fef861864d68d61cb89ed63617ee92aa SHA512 2509e8564a544b552a96a3c4c520fc628950de2d9fa1d8dd6f051c092ec978bdc6bdd25d1493de1b19e43c953e4413095957d007936af338544bb60efee52fe1
diff --git a/sys-apps/lsvpd/lsvpd-1.7.13-r1.ebuild b/sys-apps/lsvpd/lsvpd-1.7.13-r1.ebuild
deleted file mode 100644
index 433ad03b0e85..000000000000
--- a/sys-apps/lsvpd/lsvpd-1.7.13-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
-HOMEPAGE="https://github.com/power-ras/lsvpd"
-SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE=""
-
-RDEPEND="
-	dev-db/sqlite:3
-	sys-apps/hwdata
-	sys-apps/sg3_utils:0=
-	sys-libs/librtas
-	sys-libs/libvpd
-	sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-
-BDEPEND=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index c012fe080d03..193a8a9e4be6 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200120.ebuild 866 BLAKE2B e545e11ccae15769a0869b85781decca3cd9e1eb03b9cd09bf463921a795d3a62e87e75073756d47a5998e72b21a914c5fc00d02bec976ec9b178742fe9e1acc SHA512 f18068e5fd1a546f134c774b653c8bf9e36db27e244ae27b99278dbaee90df403303deef98e075115527d1890d4b89296b31baf446737a32bc57129cdfbf6a24
+EBUILD mawk-1.3.4_p20200120-r1.ebuild 978 BLAKE2B 8b0e2a29815f86d41c28c740108c43225e38d04779fa5cb657720fb9faafdfe4cfc83d0c6cc3577bf624564a7e5c7ffa0c5325954b575e2f0fc04ef5b2c8843c SHA512 83db936d5b518ffc8f632272b0e48a539e93371984a02c853eb42ad2fa9a7a3cc5c8be5884b72462675bcf0eebeb96efd78ee0a104f309bb70c6d00327e8f5a0
 MISC metadata.xml 422 BLAKE2B 8bd344848b5247eb1858b7cd31d91a796671c321610b826e602d9350e59769a4e6612438d9bf89ee2d6d63c327729d88a9ccb538b162beb816fde2910d0a4d9a SHA512 9adcc3c3b54ee935d3363e874e76f9e9b1efee00faac94184a84d10a6600dad4f11da51d4567acabf63707ca55f9b3d5ac3df107c6de8b38cad1da9891e82086
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120-r1.ebuild
index b91c7903a945..eba4448165cf 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120-r1.ebuild
@@ -9,16 +9,12 @@ MY_P="${P/_p/-}"
 DESCRIPTION="An (often faster than gawk) awk-interpreter"
 HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
 SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="app-eselect/eselect-awk"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( ACKNOWLEDGMENT CHANGES README )
 
 src_configure() {
@@ -35,9 +31,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect awk update ifunset
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
 }
 
 pkg_postrm() {
-	eselect awk update ifunset
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
 }
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 0899ced8a80e..298cedceccdb 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,3 +1,3 @@
 DIST merge-usr-5.tar.gz 9492 BLAKE2B 5fbd23a59f76004a1548ae230a4eccc9ecc81a36b235ed8744fd48cd980815c62929fb436068dd232812d92c39ed5f7d778ffe2ddbaaf4f9c7785c6927d6eb87 SHA512 b0b4d8da51a570057ce9aeccd4cf880c2a6bc52067958e23e5162d589b671a123ddbdab8a74dd5f076f689be737637e1b1a7b0581e94bfbae4e16ada37be6045
-EBUILD merge-usr-5.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7
-MISC metadata.xml 329 BLAKE2B fdb965403d89b88b2bb3c1bbb5ae8dd614dfce3f8ebc379aeee60c2d55b529887e3663b3db98a0e1fd078cf62762888bd71685eaa052c73b821d944da16413de SHA512 8a55a22b7e45363c1e2b964cb80324584814a28b6aae34f88e061f6ab137d869905be1bc16590391b082bed98602b69e06def88ea90dde0be92279733fff2890
+EBUILD merge-usr-5.ebuild 624 BLAKE2B b03d393a5f75c2d0b64b33a0eefbf70468503b567979b3087c633cc93c806c2b601364b6c2db681361ff35ae42eff5c2d7a5e418b68ec697e7c283090dd49908 SHA512 9109b04e0fe49cc73d1ed9ee703cfc3fd75d8790458e80cbcaf35608eef4dfd7fb8084a2d92f80109589e8ca8833b8676106dc154303c029e25bab98eba77fb4
+MISC metadata.xml 353 BLAKE2B 9e4087255bb09abf0945581eb1db80afdc81d6d069160f506a7e3b70f7fb52d24e088e294d4617099efcde54101f6bc711557716bfecfb256f2651b0eabaec71 SHA512 e93595bf297480f90ec3c1a477c524516c646670b3b99b176c554b7dd1e2d738c9370f6540cb787f6f9ba96177b7d76cdd3b65a936c4fbee02563dce9ac4d952
diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild b/sys-apps/merge-usr/merge-usr-5.ebuild
index 07055e4c6985..a7131924dcf8 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"
diff --git a/sys-apps/merge-usr/metadata.xml b/sys-apps/merge-usr/metadata.xml
index 64def215f310..383f6308c8ac 100644
--- a/sys-apps/merge-usr/metadata.xml
+++ b/sys-apps/merge-usr/metadata.xml
@@ -5,6 +5,7 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">floppym/merge-usr</remote-id>
 	</upstream>
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 067f975f83d0..c1aec40280d8 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -1,4 +1,6 @@
 AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddbb8318ccae67c07b5cd5a5743ea1d6154d52da20d2f50eeb00ec45a9cb4bbb52b7244715c868daff77d1e93f89dead130c4c SHA512 aab5431373d7733c9ce8088cc1474f70e4fda352494092850625d34e288682d2d0cc9223d834241c9aecc2ce4411103945c87195336ea91cd4be7fd7b21fcdce
 DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b
-EBUILD nawk-20180827.ebuild 1034 BLAKE2B 8c7e4267c1b2bcb598092cdd59c2ca4f4e3fcb7192f811343786f94e31ee01f6eeaab52ecb81a2a4cb820b6766f58e7858d126cc3d346cbfa17d67b745376517 SHA512 df7f0a9887e234e8e9ad1d12b610a1e67fb869fbd8ac296a2dadfebb320fba83c5764607ac35fa78d574d472047d00fb8c95f92d9554420ac61a8fd4b1b1431b
+DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28
+EBUILD nawk-20180827-r1.ebuild 1154 BLAKE2B 1ac2e6ff7350a251538ba4956719c1894cbc8e86e6baca1f8b00e5091d00471ee53a41060ea45341db5cdabe0a37b57a7301acc429bdbf1b37f2b18b1aab86ae SHA512 bc512b123cbbb22e946ea862efd20002877fb601787153b5fe0bdf5150f52a47c973465f5eb856fea61724b4667eabae84e79fdbecd0d293e85cd79ba69ed5b4
+EBUILD nawk-20220122-r1.ebuild 1115 BLAKE2B 37ca2d88f638cef3fef715d9d2f51f501e0fb2e4dccf0d90418c1e3f1f75434dcc70624872819919507c08c798e91a9e97cc170550d219564c31faccd482b0bf SHA512 1fe5dbed37420cb84ee5f9062eca2ad2f7493aaa0d79499a563afcadf5f3f14c2b38dabcf0a3a95b7107a3363f24dbaf00de1c1247149be58dd640acb0191a18
 MISC metadata.xml 417 BLAKE2B 85317627ae503b37bb2355d4142e2af954870cce4b495daa56d7c6df2bb1d249b4ae824daa23ac8e6013926501827cb39891b184354a4757073e055e43d3601a SHA512 004179548b6f06aa73b658add57f0f2c9755b67ebd3d7e0956c5856090a662d58c8bca35a1de7cebcd3eceeb84e0f0efb0402db9fd743d5152bcf3c74b185b9c
diff --git a/sys-apps/nawk/nawk-20180827.ebuild b/sys-apps/nawk/nawk-20180827-r1.ebuild
index d3ddf5c3f048..3e5c1d65b36b 100644
--- a/sys-apps/nawk/nawk-20180827.ebuild
+++ b/sys-apps/nawk/nawk-20180827-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,12 +13,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
-RDEPEND="
-	app-eselect/eselect-awk"
-
 DEPEND="
-	${RDEPEND}
-	virtual/yacc"
+	virtual/yacc
+"
 
 S="${WORKDIR}/awk-${PV}"
 
@@ -48,9 +45,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	eselect awk update ifunset
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
 }
 
 pkg_postrm() {
-	eselect awk update ifunset
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
 }
diff --git a/sys-apps/nawk/nawk-20220122-r1.ebuild b/sys-apps/nawk/nawk-20220122-r1.ebuild
new file mode 100644
index 000000000000..c133bc9a1ac9
--- /dev/null
+++ b/sys-apps/nawk/nawk-20220122-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
+HOMEPAGE="https://www.cs.princeton.edu/~bwk/btl.mirror/"
+SRC_URI="https://github.com/onetrueawk/awk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+DEPEND="
+	virtual/yacc
+"
+
+S="${WORKDIR}/awk-${PV}"
+
+DOCS=( README.md FIXES )
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS=-DHAS_ISBLANK \
+		ALLOC="${LDFLAGS}" \
+		YACC=$(type -p yacc) \
+		YFLAGS="-d -b awkgram"
+}
+
+src_install() {
+	newbin a.out "${PN}"
+	sed \
+		-e 's/awk/nawk/g' \
+		-e 's/AWK/NAWK/g' \
+		-e 's/Awk/Nawk/g' \
+		awk.1 > "${PN}".1 || die "manpage patch failed"
+	doman "${PN}.1"
+	einstalldocs
+}
+
+pkg_postinst() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk
+	then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 25c953680576..3a45ec54b658 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,9 @@
 DIST osinfo-db-20220516.tar.xz 129272 BLAKE2B 47f6eb2e1ae0cad277be71fb0955415c4afdb27e3b80e36c98ce5b7c8d22efcab91047e93c586045baa233ac61dc08113a5aedb626db4f24bf0472455826e481 SHA512 44c56824c774e68bd79633c415c71155e814c1f928fceba845ab649f8cb0dd325ad06b91a2d720cb25fd62e67d7ea17774cc395995b4f201527c4a6aa447a744
 DIST osinfo-db-20220830.tar.xz 136300 BLAKE2B 8710ed459db0573c436e2f25bd22d9dc7761b23a9046a406ffb2b106e7623010f8c9134ce24fe7fa096c6da698d9ec6749df9755c75e43af4d1be1140d2ab1b9 SHA512 8d728ce1afab9855430fa40595f8c156e72c155cd91e0064a9922a49e948116d5f49a75c89b642c5804b7f43f73e4d81ba179f8dc8cbeef8f10ccef7f9a696fb
 DIST osinfo-db-20221018.tar.xz 136440 BLAKE2B 819e3debffb2381242047d8e93cb8eff04b3b7b77b2490e9a94a1326586114ac8113410795663179a9922d78123c59f93d492e678111388d97b72a8d5863a248 SHA512 5a74d05ff1b2c7ac3693c8b4678a2464268f53efa41fce9920d3d030cf3c8b719d696353144f867fcf00d7462b4c37768d569277b73865df258532b51c971ee1
+DIST osinfo-db-20221130.tar.xz 135936 BLAKE2B 34fbbf6eded6d6e53c361ed8e5fc2a45eba546ae6aff3e02f31d321150ff1d7e05be9430d2a8c3a482139e21c73f310ec583d74827c38d206c219ee25f889cf4 SHA512 c0e7cf305d113c61e40f315521e606e73373ffa819ba059cb5ef245784fbf23e247180e8da1da366c96f1595470a870f193ed93a643675dda356b2c79f798015
 EBUILD osinfo-db-20220516.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
 EBUILD osinfo-db-20220830.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 EBUILD osinfo-db-20221018.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
+EBUILD osinfo-db-20221130.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 MISC metadata.xml 348 BLAKE2B fcfdacef0e6fc650338b935811d7b2ff4460497bb332b87312bd4c69c7ac260d9dc5288b383be27b1522a9ff9717a51fd4b2bd8d97f67e359ca8e5ff6c2c5c64 SHA512 4519bf98303033ae9fa40088f38eb6d703053eb6896d939756669dcf50404c5dac577fd3870afa4be5e40da4d4901b65f452b6779dac886d1673866b3e0f6f2c
diff --git a/sys-apps/osinfo-db/osinfo-db-20221130.ebuild b/sys-apps/osinfo-db/osinfo-db-20221130.ebuild
new file mode 100644
index 000000000000..28ae854564ac
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20221130.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 46f37ee0a376..e362faff354d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,11 +1,14 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-3.0.38.1-xz-32-bit.patch 4263 BLAKE2B 83ee332acc8290a1e96eaafbfff7e42c6a686c4dc34e1fb2e1e935fe04cd98071d14299d76294e8d4178615ee9309985a7f508a7aaad0f9f0efaaeeb89301565 SHA512 6d75e5bdc463ffed264b4db5a953a7bb49971109ea88c4645d1c35dd2d5e8f0a4913a2fc20b858a91921734f6ff906293b14308e24bf591d86150e93af6bbcc8
+AUX portage-3.0.39-bash-5.2-patsub_replacement.patch 1881 BLAKE2B 2bb2d38a03aecf54c1b438954eaa4bf49e5102dc4e9ada17b394d0bc1bfbe1c4b5ab5e193c540e64699d422f80b8ca12b4a75cc31714cdfda40f3a54878a4316 SHA512 9792ee5bccb1dca2c33512a4725f4c951a296921070de5ec0048028ac0a36a0e59a7d4867a44057eda6dc353cfab3b5ecc27c1089d650069f526f80c7c417e71
 AUX portage-3.0.39-implicit-func-decls-no-fatal.patch 1262 BLAKE2B c1615106d4adc53193dcbf52e6cce926cd0fa3548d504974ace467b2ceb87179753bbc8bc954a10a13ea4fc381a2a008e26dfea6416f8945c6468eff315c0b29 SHA512 ebd4f3910ab94c0555bcc87135f37970e72d0b61912f9a7c7c09c525c4b619e729a1a88208ae4986ceda1f23a29acc4e60362eca76ba247c181eea4f5ebef8cc
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
 DIST portage-3.0.39.tar.bz2 1118397 BLAKE2B bd0105c48741cdf11166208ebf11f524cb87980a027b69ccdcc2a607847dcd79d886b542adf08eefdd2df8a35e78f95f0f79843694ec9c2b1488d7ee1fd187e8 SHA512 e3ef14136b0ffb5f77fed9cb89ce6ee59425dd34acc5254390e75164aee160e954498bca4084f3d71642f285ba040ce8347badf6382dd1369aa52425ce907e39
+DIST portage-3.0.40.tar.bz2 1119105 BLAKE2B 64be77aaf280008829847e6c78f1d0e1b74af4e5835ced96b0d146fef81c6c8c49e70e92ebb9bc1805f1853dbed4ada4b9fc6282b7b04478fe0fadec7b93784e SHA512 fd2e858788e41ea7f9201d77e056a71d6bd2a450be9896d9e10ad731f7d88b8bb1c69fd7b9bea3ab831fb352e0ce6df39f97786d067244794254996f6927a455
 EBUILD portage-3.0.38.1-r4.ebuild 9166 BLAKE2B a16bc125979b171a567935314d6895c371fa90394e7366dc4af678541817cdd8cd44ac1d30005953298b936db059fe226b47678d5cb0eb2610c0e871a39204b1 SHA512 bd647fbe3f7255de375a36b5bc843113fcf1505de5d9851b088546c94ca85d369e84647af7d8eb3115e5c0fab61616ab0aff6fb3d5691bc1d1ac20c4f0a61e23
-EBUILD portage-3.0.39-r2.ebuild 9193 BLAKE2B 69d3b255bb488d92eddf5ed9838977f6718906fdd87e984149ea4194b14b67ef0262ef132c90c7e0038f67be2685820378a0b4d68f1e1f773a5de8df259ddc52 SHA512 0f677b593b504fd887833109255eace6d2c31b070ab36832b476f2334b2e133a457e5fd66d1e094ca6674ffafd490f48771053875dda18e04948b855db873fa9
+EBUILD portage-3.0.39-r3.ebuild 9248 BLAKE2B d6e927109c445a6bc80497b3c52ff8ae88fbe1444aca9bccefe6ae2ca05095eecb15a356ad0bb70cc21f0dbe9c4943b721a33062d4b2a3f837ca6bb08dfd3d98 SHA512 a5e18930944135784142371728e190c11a760dc37f61a77bc92295e813a7ce691cffdde1dd605a2b8ab7f745de45813278aa0672aa944f2b64e1a24a26939c11
+EBUILD portage-3.0.40.ebuild 9137 BLAKE2B 3614d94ce8acdb4ad42ca0445a8dad5991c563d316aee5b055d086f5aba7816d1a96144c667db7b3b644f9f474efe42e350151db808d67a942f973e54182e75d SHA512 bbc8d67eeccdb41a31be81c76643679b3131da2fd70c43ed22a007ca5ddfdff04ee3ac60fd9f702ed41f54f05f52e450c095b205279ad168602f6e3bb97e1983
 EBUILD portage-9999.ebuild 8377 BLAKE2B 11d2bb192cd0fb41b528f7b7fa734aa91432d3a3dd51a28d8d1ab4c9f4d677e2f6ebc3caa0dce66651ce73c1d4a9a6cb5210cd7e392c88817fa2b55db12d492a SHA512 71551c10785fe35c4856e4d33343e59a663e16ff1d1d0bdcbaed58be4dd083e51a63b142fb7d17ace1ca9bd9b307a8597c5a3d0344693555cfa784d68fee91ec
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch b/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
new file mode 100644
index 000000000000..90c678998a05
--- /dev/null
+++ b/sys-apps/portage/files/portage-3.0.39-bash-5.2-patsub_replacement.patch
@@ -0,0 +1,49 @@
+https://github.com/gentoo/portage/commit/69cac73ba0a7bcf2e2cff88c60d389895a550623
+
+From 69cac73ba0a7bcf2e2cff88c60d389895a550623 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 30 Nov 2022 01:09:12 +0000
+Subject: [PATCH] ebuild.sh: disable patsub_replacement in Bash 5.2
+
+patsub_replacement is a new option in bash-5.2 that is also default-on
+in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
+hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
+and eclasses.
+
+Thanks to Kerin for both raising this & being persistent with trying
+to get Bash 5.2 to be suitable for use in Gentoo.
+
+Bug: https://bugs.gentoo.org/881383
+Thanks-to: Kerin Millar <kfm@plushkava.net>
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/ebuild.sh
++++ b/bin/ebuild.sh
+@@ -18,6 +18,7 @@ source "${PORTAGE_BIN_PATH}/isolated-functions.sh" || exit 1
+ # used instead.
+ __check_bash_version() {
+ 	# Figure out which min version of bash we require.
++	# Adjust patsub_replacement logic below on new EAPI!
+ 	local maj min
+ 	if ___eapi_bash_3_2 ; then
+ 		maj=3 min=2
+@@ -50,6 +51,19 @@ __check_bash_version() {
+ 	if ___eapi_bash_3_2 && [[ ${BASH_VERSINFO[0]} -gt 3 ]] ; then
+ 		shopt -s compat32
+ 	fi
++
++	# patsub_replacement is a new option in bash-5.2 that is also default-on
++	# in that release. The default value is not gated by BASH_COMPAT (see bug #881383),
++	# hence we need to disable it for older Bashes to avoid behaviour changes in ebuilds
++	# and eclasses.
++	#
++	# New EAPI note: a newer EAPI (after 8) may well adopt Bash 5.2 as its minimum version.
++	# If it does, this logic will need to be adjusted to only disable patsub_replacement
++	# for < ${new_api}!
++	if (( BASH_VERSINFO[0] >= 6 || ( BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] >= 2 ) )) ; then
++		shopt -u patsub_replacement
++	fi
++
+ }
+ __check_bash_version
+ 
+
diff --git a/sys-apps/portage/portage-3.0.39-r2.ebuild b/sys-apps/portage/portage-3.0.39-r3.ebuild
index 430e100baf73..a98bde44683f 100644
--- a/sys-apps/portage/portage-3.0.39-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.39-r3.ebuild
@@ -86,6 +86,7 @@ pkg_pretend() {
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/${P}-implicit-func-decls-no-fatal.patch
+		"${FILESDIR}"/${P}-bash-5.2-patsub_replacement.patch
 	)
 
 	distutils-r1_python_prepare_all
diff --git a/sys-apps/portage/portage-3.0.40.ebuild b/sys-apps/portage/portage-3.0.40.ebuild
new file mode 100644
index 000000000000..89c318fe02f9
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.40.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index fc9945205861..31ac45a1b635 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,6 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-DIST texinfo-7.0.tar.xz 4900752 BLAKE2B a8314e048d14584b07fea5246223ed1387f374eac77d7b8d736b6d13ef3c72b2ef117f251e34e780761fa70a9d138a86f14feb825371022fa35292e39c8dab63 SHA512 99f691515a3c43c76eca7dd78e8a79108ec8d64ebb2a677bb0473e5a67da50ebdf14d9c5428ebe7618f6cba435e6a4c42079ad2f5665371b06585f2fd28d695e
+DIST texinfo-7.0.1.tar.xz 4890348 BLAKE2B 9d61722e7ff8a71e05770552050cc861d778b9faa95f801e40d4353601a5692f01ad8e794dfb0e7b5b29efa2c701de4a76505732a806b0303b5c1fe0599816f1 SHA512 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
-EBUILD texinfo-7.0.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
+EBUILD texinfo-7.0.1.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.ebuild b/sys-apps/texinfo/texinfo-7.0.1.ebuild
index 9669d1502f2e..9669d1502f2e 100644
--- a/sys-apps/texinfo/texinfo-7.0.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.1.ebuild