diff --git a/Manifest.files.gz b/Manifest.files.gz
index f08cb553f73c..75fd11210870 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d87baea2823e..f2ae55c2e6ec 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index cf279923f976..b3a6c4018eeb 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,2 +1,2 @@
-DIST rcm-1.3.4.tar.gz 93200 BLAKE2B 13ed8694e67fd38e9547e310d50b917566889c74b133446b4384f80084036d62130ffac0b3e17ca6020eb8909193f6095ac42a9d360c7f2d529b31253b87e2d3 SHA512 347facbb99c08ead942a299ef981a22e4e1578235d256343a91d1f0e9ffcda8e8053d6470861538a7435fdff2a176221a17222858eb5e0e8c5c4930b399e7fc5
DIST rcm-1.3.5.tar.gz 95585 BLAKE2B 5ea5f617cd8249a092a21d37abca7524e66b29a98cfc49415fc6347f64f519f23a1a4834e82460c0fcc97b4a5820b148762377d8195e9fb5c7245d9db5619b17 SHA512 2b919d68ee8c3b530f3504d3283b66cb00b46267e4e7b6940758b42ae54a8fbe268b4dd97c09beaf2377d135b21ffe4e31c09ef56a6b80029cf9ad79c66d10a5
+DIST rcm-1.3.6.tar.gz 96280 BLAKE2B d8408a46ba1db78fccdac32064eb95086206beb7a83b3b63cded27b6e27866ec88512b39a612d2807bf7585741fb97b9778931a612f167e0bc68b9ec3da28880 SHA512 83c2e54161d569969d7b03f21601c5f2ef647dff2e573a75831cd3f8f7cc35b779d554ec2ac7d06e5a31c0d385f2856de0aa669290a9b6d51b17feeb954f99e0
diff --git a/app-admin/rcm/rcm-1.3.4.ebuild b/app-admin/rcm/rcm-1.3.6.ebuild
similarity index 89%
rename from app-admin/rcm/rcm-1.3.4.ebuild
rename to app-admin/rcm/rcm-1.3.6.ebuild
index f2ce408773d9..388c31621d71 100644
--- a/app-admin/rcm/rcm-1.3.4.ebuild
+++ b/app-admin/rcm/rcm-1.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="rc file (dotfile) management"
HOMEPAGE="https://github.com/thoughtbot/rcm"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8ef08289aa8d..c4088ab984ef 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/upx/upx-4.0.1-r1.ebuild b/app-arch/upx/upx-4.0.1-r1.ebuild
index a1f1b77dd66d..16adb6cdbc4e 100644
--- a/app-arch/upx/upx-4.0.1-r1.ebuild
+++ b/app-arch/upx/upx-4.0.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-src"
LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="!app-arch/upx-bin"
BDEPEND="app-arch/xz-utils[extra-filters]"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a95630009875..4f9e9ec5306c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index cb736ad45606..12cdaaa5f5d2 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,3 +1,4 @@
DIST certbot-1.32.0.tar.gz 1372897 BLAKE2B ce0be11e07186fa5ec71c52bb728161be3326b86214e13951335f460ed19b3fd7a66eaca242cb51767e0c335c02ceba1c964fc39ab79dd7c3dd2b6a383e47732 SHA512 6addbb14e69dd6206749c5659a114bc2421d948b5d01c95cacf389fc9c23a735881f3eb0c2fc18e6729e3fac95bc86b4b6a1575affe28e94b81255d4ec13b242
DIST certbot-2.0.0.tar.gz 1326589 BLAKE2B d1dc7e2c2a807f767d5dd4209b0fe079e18a8859c9a1b1dbdf62f240c123f20d5a63f01c5a92a4463b99f50b343e6956ac9a53c14c576b16bcd46c07f6f775f3 SHA512 c72d428a43d19b105a206931f8fe74e0c68dfc288a2e8667f25b9e292820eccd9ad04a11d9d3c4fcdbcb08cf2adc5f5fad12bd53b8df09dcc77c0a500a30e518
DIST certbot-2.1.0.tar.gz 1327451 BLAKE2B c4694622648427146574aa7c056d5d76dc3c4f6b8487a506d1c4996239f979d89ca26980b2ffbaab975458d0691acaa07a46a75098b6146e6e3c51e6eaa64be0 SHA512 83c3a6abeffb135cebd0d0f4561f3814039962e3b895aaf7bef6570641fccda2da04f1a6110c5e90d6ed3346402cbb3ff543b0a096e8e18f6345edd22da643cc
+DIST certbot-2.2.0.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
diff --git a/app-crypt/acme/acme-2.2.0.ebuild b/app-crypt/acme/acme-2.2.0.ebuild
new file mode 100644
index 000000000000..64472c2d2ee3
--- /dev/null
+++ b/app-crypt/acme/acme-2.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-2.2.0.ebuild b/app-crypt/certbot/certbot-2.2.0-r1.ebuild
similarity index 93%
rename from app-crypt/certbot/certbot-2.2.0.ebuild
rename to app-crypt/certbot/certbot-2.2.0-r1.ebuild
index d99294b4bc87..729204440566 100644
--- a/app-crypt/certbot/certbot-2.2.0.ebuild
+++ b/app-crypt/certbot/certbot-2.2.0-r1.ebuild
@@ -25,8 +25,9 @@ SLOT="0"
IUSE="selinux"
+# See certbot/setup.py for acme >= dep
RDEPEND="
- >=app-crypt/acme-2.1.0[${PYTHON_USEDEP}]
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index a316554569fd..729204440566 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
IUSE="selinux"
+# See certbot/setup.py for acme >= dep
RDEPEND="
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
>=dev-python/ConfigArgParse-0.9.3[${PYTHON_USEDEP}]
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c23a9354f0e8..a13d9ce70568 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/buttercup/buttercup-1.29.ebuild b/app-emacs/buttercup/buttercup-1.29.ebuild
index cfebece4d7cc..315cf287813f 100644
--- a/app-emacs/buttercup/buttercup-1.29.ebuild
+++ b/app-emacs/buttercup/buttercup-1.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}"/emacs-${P}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
DOCS=( docs/{running,writing}-tests.md )
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/centaur-tabs/Manifest b/app-emacs/centaur-tabs/Manifest
new file mode 100644
index 000000000000..98e73fb2efcc
--- /dev/null
+++ b/app-emacs/centaur-tabs/Manifest
@@ -0,0 +1 @@
+DIST centaur-tabs-3.2.tar.gz 386546 BLAKE2B a1649658119af2cbb8642cdd0d6d8eedea7b58626a3b205f42e1a1c4424bd0f78eedb56eb410c34a5b95400b56207056f05d8b325cb674eaf2975cb36ddd677c SHA512 75b2ba01de77f0d02de0dd2f37b12614c9a77f39eee6647c66091893d2f6fd46bf65d7af7e1fbd8db77421cf50e43ba94d6910e811b51b2bcddd6d19cf031c3a
diff --git a/app-emacs/centaur-tabs/centaur-tabs-3.2.ebuild b/app-emacs/centaur-tabs/centaur-tabs-3.2.ebuild
new file mode 100644
index 000000000000..cc3f64bf631e
--- /dev/null
+++ b/app-emacs/centaur-tabs/centaur-tabs-3.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Customizable tabs plugin for GNU Emacs"
+HOMEPAGE="https://github.com/ema2159/centaur-tabs/"
+SRC_URI="https://github.com/ema2159/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/powerline"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/centaur-tabs/files/50centaur-tabs-gentoo.el b/app-emacs/centaur-tabs/files/50centaur-tabs-gentoo.el
new file mode 100644
index 000000000000..a1d9a346e2f7
--- /dev/null
+++ b/app-emacs/centaur-tabs/files/50centaur-tabs-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'centaur-tabs-local-mode "centaur-tabs"
+ "Toggle local display of the tab bar." t)
+(autoload 'centaur-tabs-mode "centaur-tabs"
+ "Toggle display of a tab bar in the header line." t)
diff --git a/app-emacs/centaur-tabs/metadata.xml b/app-emacs/centaur-tabs/metadata.xml
new file mode 100644
index 000000000000..f72de5ba10aa
--- /dev/null
+++ b/app-emacs/centaur-tabs/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ This package offers tabs with a wide range of customization options, both
+ aesthetical and functional, implementing them trying to follow the Emacs
+ philosophy packing them with useful keybindings and a nice integration with
+ the Emacs environment, without sacrificing customizability.
+
+
+ https://github.com/ema2159/centaur-tabs/issues/
+ ema2159/centaur-tabs
+
+
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
index b933cb81646d..fe2ff5c0e82c 100644
--- a/app-emacs/compat/Manifest
+++ b/app-emacs/compat/Manifest
@@ -1,4 +1,4 @@
DIST compat-28.1.1.3.tar.gz 72597 BLAKE2B 82186713370fed7f97eb057cb330d77c1d758224ad37c0b7fbbd21221b0d2ffd68be805483f3e9577866f02079c83a5686918c87a1ed7c67c9acdd64aa3a560b SHA512 d65e5ce666607cd6d26cf771d6878caeb6641aff0fc924ec901955c1a03b6fe42e3527220448fa92a8d6c3f5bd65e6f915ed4ada1be01a29d7919f916826e48f
DIST compat-28.1.2.2.tar.gz 82479 BLAKE2B 154104a3d1cf953f712de357d21736d648289dbdaccb0f9ca5cbd44cb1e41b9b7b4b52394548658b47216f9205f28d2020b015d22b5d0c4df63c79794ddfc56e SHA512 65cafbf4d48815f447e412c4dbd87c5bd3357df5302660a5296582648926f8e3fe96b4b90b53674f18be8affe66af95c8db7e58d7a9dd63d2b57983962e5a53c
-DIST compat-29.1.0.1.tar.gz 98171 BLAKE2B 46fd4052b7e3f6deb7789cb50d2d6c19d698531de04a171b3afc9035ed6ff3e204ee58e770eb699c05d722141b409e34dc13df1af6e3cda275ff107759a0a957 SHA512 51af7d1f87c838d421f017f2bdcce215e6951bd69181abff64c2c87f6ff1aac1b5f29e0dc91be2f48589e9a6092007a99d987791213801c7e0d89a372dfa4b72
DIST compat-29.1.1.0.tar.gz 94072 BLAKE2B 675f0bbf4411fb0d2c2e8f77bcd62dbe56da1f052bd6e390dade0c8075eaa480bb387280a29ae09396a2f4bf27746ae1065d38dd1b7882b9c8c0ec3a4eb776e5 SHA512 5c7b093314cd8f8d8cbab4f470a64d3f104d0e79d2881f2f2309700c6fe5f58a72a8a65379868edba33c0b6af1d43f1474e2fefc65c033f39981d29fca35259a
+DIST compat-29.1.1.1.tar.gz 96932 BLAKE2B 69941bc24d5146103d82862214064b11bfdd335d1af48bf776024c4f73fa156b1d953bb7dad902bbf31a957dfa498762377136ea062fbc7aa0d716cc42bc0228 SHA512 d31b5544e703252d97ef8145ce9f1dc3265264d1e1b62ca46e0baf200b6fb839d20701dafccedb22661472678ca4fcb74fa613fe7244e6359504fb67699f18cc
diff --git a/app-emacs/compat/compat-28.1.2.2.ebuild b/app-emacs/compat/compat-28.1.2.2.ebuild
index 25a6e34f331f..31a646a223a7 100644
--- a/app-emacs/compat/compat-28.1.2.2.ebuild
+++ b/app-emacs/compat/compat-28.1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
BDEPEND="sys-apps/texinfo"
diff --git a/app-emacs/compat/compat-29.1.0.1.ebuild b/app-emacs/compat/compat-29.1.1.1.ebuild
similarity index 81%
rename from app-emacs/compat/compat-29.1.0.1.ebuild
rename to app-emacs/compat/compat-29.1.1.1.ebuild
index 8bc70c870235..459edf66eea1 100644
--- a/app-emacs/compat/compat-29.1.0.1.ebuild
+++ b/app-emacs/compat/compat-29.1.1.1.ebuild
@@ -3,16 +3,15 @@
EAPI=8
-H=8a32564247ad3baee571252a2004c3d347962d01
-NEED_EMACS=24
+NEED_EMACS=24.4
inherit elisp
DESCRIPTION="Compatibility libraries for Emacs"
-HOMEPAGE="https://git.sr.ht/~pkal/compat/"
-SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${H}.tar.gz
+HOMEPAGE="https://github.com/emacs-compat/compat/
+ https://git.sr.ht/~pkal/compat/"
+SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-emacs/filladapt/filladapt-2.12.2.ebuild b/app-emacs/filladapt/filladapt-2.12.2.ebuild
index 3554b3861367..452f3c20fe9d 100644
--- a/app-emacs/filladapt/filladapt-2.12.2.ebuild
+++ b/app-emacs/filladapt/filladapt-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
SITEFILE="50${PN}-gentoo.el"
DOC_CONTENTS="Filladapt is not enabled as a site default. Add the following
diff --git a/app-emacs/ghub/ghub-3.5.6.ebuild b/app-emacs/ghub/ghub-3.5.6.ebuild
index 64e656791e15..d4f6a63d4e81 100644
--- a/app-emacs/ghub/ghub-3.5.6.ebuild
+++ b/app-emacs/ghub/ghub-3.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="docs/ghub.texi"
diff --git a/app-emacs/org-mode/org-mode-9.6.ebuild b/app-emacs/org-mode/org-mode-9.6.ebuild
index bc7446d9fb1c..308b4b2096c6 100644
--- a/app-emacs/org-mode/org-mode-9.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="doc odt-schema"
RESTRICT="test"
diff --git a/app-emacs/powerline/Manifest b/app-emacs/powerline/Manifest
new file mode 100644
index 000000000000..de26a4195700
--- /dev/null
+++ b/app-emacs/powerline/Manifest
@@ -0,0 +1 @@
+DIST powerline-2.5_p20221110.tar.gz 25649 BLAKE2B 9ffe42a0edbe620a77272636ed7426dcfb35388a20dcbe7905a95a6e0971d4e249ffc4af70061e61fdb4ea98fcef982d7da7617e81f5db0e2df425dfe31ea097 SHA512 be0eedd1b79e37b80f0520706af11b36d0775aced51f08239d240fc19c1c54124bc736009cb2eb1332b9a9a064221885dcaebfac5595211afe9939409256d92b
diff --git a/app-emacs/powerline/files/50powerline-gentoo.el b/app-emacs/powerline/files/50powerline-gentoo.el
new file mode 100644
index 000000000000..bc3d2514cd23
--- /dev/null
+++ b/app-emacs/powerline/files/50powerline-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "powerline-autoloads" nil t)
diff --git a/app-emacs/powerline/metadata.xml b/app-emacs/powerline/metadata.xml
new file mode 100644
index 000000000000..9565b18c1a6e
--- /dev/null
+++ b/app-emacs/powerline/metadata.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ Powerline is a library for customizing the mode-line that is based on the
+ Vim Powerline. A collection of predefined themes comes with the package.
+ This version has utf-8 support enabled. The utf-8 separators will display a
+ unicode character properly under mintty for example - as long as you have
+ patched fonts installed. By default, any terminal mode emacs will use the
+ utf-8 separators.
+
+
+ https://github.com/milkypostman/powerline/issues/
+ milkypostman/powerline
+
+
diff --git a/app-emacs/powerline/powerline-2.5_p20221110.ebuild b/app-emacs/powerline/powerline-2.5_p20221110.ebuild
new file mode 100644
index 000000000000..f1e953e1fbb1
--- /dev/null
+++ b/app-emacs/powerline/powerline-2.5_p20221110.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} = *_p20221110 ]] && H=c35c35bdf5ce2d992882c1f06f0f078058870d4a
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs version of the Vim powerline"
+HOMEPAGE="https://github.com/milkypostman/powerline/"
+SRC_URI="https://github.com/milkypostman/${PN}/archive/${H}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp_src_compile
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/sokoban/sokoban-1.4.9.ebuild b/app-emacs/sokoban/sokoban-1.4.9.ebuild
index 27002f3bc2f1..8f16cdf1ba67 100644
--- a/app-emacs/sokoban/sokoban-1.4.9.ebuild
+++ b/app-emacs/sokoban/sokoban-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
ELISP_REMOVE="sokoban-pkg.el"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 783abc10adc3..18f4c38e6bae 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ranger/metadata.xml b/app-misc/ranger/metadata.xml
index ff6abe0ce768..ca4f0bec31c3 100644
--- a/app-misc/ranger/metadata.xml
+++ b/app-misc/ranger/metadata.xml
@@ -5,6 +5,14 @@
ionen@gentoo.org
Ionen Wolkens
+
+ nex+b-g-o@nexadn.de
+ Adrian Schollmeyer
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
Ranger is a console file manager that gives you greater
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7572f68cd538..0a9d92a6fe56 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 492c0d8e388b..3b2e5a268698 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,3 +1 @@
-DIST gentoolkit-0.5.0.tar.gz 3206598 BLAKE2B a379dcbbaba9d52c241fea020b87c458384e44092539947909e14fd6c63fd9cc06d076b8081874edf17fc50e80fe48ceab3400c90046867dc409e7ac39c17231 SHA512 8a5c344f3a17c4c779abbcaa35b5e3f147106dbc61310d0d1a816ec8080914271fa45c311a8feeb1bfe14195af7cf34c0b29142d6e43e2de232dae96fbd00861
-DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77f9d8a47636cd722f2028a906d43874132d55a71bf373b3d10c7c10034f5d8ce0280a35041b0c60a1d5aa2ed6296a1 SHA512 667e464853b17ae297c59fb06e8f4563119a1382470d064c5721ae898e61173e9af5b071c7618d315232e6974fec205e27559785d2816253711de3e83d9e1911
DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
deleted file mode 100644
index 6a50db9ca669..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.5.0-python3_9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# https://github.com/gentoo/gentoolkit/pull/11
-# https://bugs.gentoo.org/747034
-diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
-index 22c249e..c3dba98 100644
---- a/pym/gentoolkit/metadata.py
-+++ b/pym/gentoolkit/metadata.py
-@@ -73,8 +73,7 @@ class _Maintainer(object):
- self.description = None
- self.restrict = node.get('restrict')
- self.status = node.get('status')
-- maint_attrs = node.getchildren()
-- for attr in maint_attrs:
-+ for attr in node.iter():
- setattr(self, attr.tag, attr.text)
-
- def __repr__(self):
-@@ -101,7 +100,7 @@ class _Useflag(object):
- _desc = ''
- if node.text:
- _desc = node.text
-- for child in node.getchildren():
-+ for child in node.iter():
- _desc += child.text if child.text else ''
- _desc += child.tail if child.tail else ''
- # This takes care of tabs and newlines left from the file
-@@ -213,7 +212,7 @@ class MetaData(object):
- if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'):
- return None
-
-- for node in self._herdstree.getiterator('herd'):
-+ for node in self._herdstree.iter('herd'):
- if node.findtext('name') == herd:
- return node.findtext('email')
-
-@@ -283,7 +282,7 @@ class MetaData(object):
- return self._useflags
-
- self._useflags = []
-- for node in self._xml_tree.getiterator('flag'):
-+ for node in self._xml_tree.iter('flag'):
- self._useflags.append(_Useflag(node))
-
- return self._useflags
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
deleted file mode 100644
index a9dae6150454..000000000000
--- a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Tue, 13 Oct 2020 10:04:07 -0400
-Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129
-
-Regression from commit: 517581df206766
-link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829
-Gentoo bug: https://bugs.gentoo.org/748129
-Signed-off-by: Brian Dolbec
----
- pym/gentoolkit/metadata.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
-index c3dba98..0b58392 100644
---- a/pym/gentoolkit/metadata.py
-+++ b/pym/gentoolkit/metadata.py
-@@ -101,8 +101,11 @@ class _Useflag(object):
- if node.text:
- _desc = node.text
- for child in node.iter():
-- _desc += child.text if child.text else ''
-- _desc += child.tail if child.tail else ''
-+ # prevent duplicate text
-+ if child.text and child.text not in _desc:
-+ _desc += child.text
-+ if child.tail and not child.tail in _desc:
-+ _desc += child.tail
- # This takes care of tabs and newlines left from the file
- self.description = re.sub(r'\s+', ' ', _desc)
-
---
-libgit2 1.0.1
-
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
deleted file mode 100644
index 095948f10c8d..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_9 pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 tmpfiles
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- sys-apps/gawk
- sys-apps/gentoo-functions"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.0-python3_9.patch
- "${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
-)
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-
- if use prefix-guest ; then
- # use correct repo name, bug #632223
- sed -i \
- -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
- pym/gentoolkit/profile.py || die
- fi
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.4.0"; then
- SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process revdep-rebuild.conf
-
- if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
- elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- elog "part of the gentoolkit package."
- elog "The gentoolkit-dev package is now deprecated in favor of a single"
- elog "gentoolkit package. The remaining tools from gentoolkit-dev"
- elog "are now obsolete/unused with the git based tree."
- fi
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
deleted file mode 100644
index 1ab50e71d23e..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1 tmpfiles
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
- inherit git-r3
-else
- SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- sys-apps/gawk
- sys-apps/gentoo-functions"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
- python_setup
- echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
- VERSION="${PVR}" "${PYTHON}" setup.py set_version
- distutils-r1_python_prepare_all
-
- if use prefix-guest ; then
- # use correct repo name, bug #632223
- sed -i \
- -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \
- pym/gentoolkit/profile.py || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process revdep-rebuild.conf
-
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog
- elog "For further information on gentoolkit, please read the gentoolkit"
- elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
- elog
- elog "Another alternative to equery is app-portage/portage-utils"
- elog
- elog "Additional tools that may be of interest:"
- elog
- elog " app-admin/eclean-kernel"
- elog " app-portage/diffmask"
- elog " app-portage/flaggie"
- elog " app-portage/portpeek"
- elog " app-portage/smart-live-rebuild"
- fi
-}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 495672ea2aa5..594069d16a4b 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,2 +1 @@
DIST tatt-0.10.tar.gz 22675 BLAKE2B 4272cd0bf65a2181ba70d12fe8ca593403d7217aebf2f4dffd2f69397e686c79bc93ec70c756f1e94c548ed2acd8af7470c022611c16b5f3571af860aeca4b9c SHA512 1993f597e92b0b1f004e492aa164d7de6cf6776285850e5245f3328de0396c54cfc58943c767afe1fd1c49a771a1f33c65b6bed3c7d164223767567c05e12af1
-DIST tatt-0.9.tar.gz 22659 BLAKE2B c67da6d71bd46a7a1e73810f6f837cbe18b4fcfdf18da2401ab696e69d05c3ccbdeacaf152999dbf49d39c20e0e9e656e05c294a5eb7128015ee06d25bf95fcb SHA512 4f8d4f6d56ce1389caee8a67d1ae13967692fad90e1bc484ec9ffd9fa057e858c2fc4e6cefa496b33c7565b06e7f71e012a94653de4a501f3b25ec77d07cea92
diff --git a/app-portage/tatt/tatt-0.9.ebuild b/app-portage/tatt/tatt-0.9.ebuild
deleted file mode 100644
index 7c14d2aff58c..000000000000
--- a/app-portage/tatt/tatt-0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+templates"
-
-RDEPEND="
- app-portage/eix
- app-portage/gentoolkit[${PYTHON_USEDEP}]
- app-portage/nattka[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- www-client/pybugz
-"
-
-python_install_all() {
- distutils-r1_python_install_all
- if use templates; then
- insinto "/usr/share/${PN}"
- doins -r templates
- fi
- doman tatt.1
- doman tatt.5
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 6489c81141bd..e26ccb51adc1 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-5.2_p15.ebuild b/app-shells/bash/bash-5.2_p15.ebuild
deleted file mode 100644
index 9dbde4810a73..000000000000
--- a/app-shells/bash/bash-5.2_p15.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
- case ${PV} in
- 9999|*_alpha*|*_beta*|*_rc*)
- return 1
- ;;
- *)
- return 0
- ;;
- esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
-READLINE_VER="8.2_p1"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
- EGIT_BRANCH=devel
- inherit git-r3
-elif is_release ; then
- SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
- if [[ ${PLEVEL} -gt 0 ]] ; then
- # bash-5.1 -> bash51
- my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
- patch_url=
- my_patch_index=
-
- for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
- for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
- patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
- SRC_URI+=" ${patch_url}"
- SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
- done
-
- MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
- done
-
- unset my_pn patch_url my_patch_index
- fi
-else
- SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
- SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
- SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if is_release ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
- >=sys-libs/ncurses-5.2-r2:=
- nls? ( virtual/libintl )
-"
-if is_release ; then
- DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
- ${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-BDEPEND="
- app-alternatives/yacc
- pgo? ( dev-util/gperf )
- verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
- #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
- # Patches from Chet sent to bash-bug ml
- "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
- # bug #7332
- if is-flag -malign-double ; then
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]] ; then
- git-r3_src_unpack
- else
- if use verify-sig ; then
- verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
-
- local patch
- for patch in "${MY_PATCHES[@]}" ; do
- verify-sig_verify_detached ${patch}{,.sig}
- done
- fi
-
- unpack ${MY_P}.tar.gz
-
- if [[ -n ${GENTOO_PATCH_VER} ]] ; then
- unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
- fi
- fi
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
- # Clean out local libs so we know we use system ones w/releases.
- if is_release ; then
- rm -rf lib/{readline,termcap}/* || die
- touch lib/{readline,termcap}/Makefile.in || die # for config.status
- sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches, bug #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/* || die
-
- eapply -p0 "${PATCHES[@]}"
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --disable-profiling
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
- --with-curses
-
- $(use_enable mem-scramble)
- $(use_enable net net-redirections)
- $(use_enable readline)
- $(use_enable readline bang-history)
- $(use_enable readline history)
- $(use_with afs)
- $(use_with mem-scramble bash-malloc)
- )
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
-
- # Don't even think about building this statically without
- # reading bug #7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- if is_release ; then
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER%%_*}
-
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins ; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
-
- # bug #444070
- tc-export AR
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- if use pgo ; then
- # Build Bash and run its tests to generate profiles.
- emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
-
- # Used in test suite.
- unset A
-
- emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
-
- if tc-is-clang; then
- llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
- fi
-
- # Rebuild Bash using the profiling data we just generated.
- emake clean
- emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
-
- use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
- else
- emake
-
- use plugins && emake -C examples/loadables all others
- fi
-}
-
-src_test() {
- # Used in test suite.
- unset A
-
- default
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
- keepdir /etc/bash/bashrc.d
-
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
-
- if ! use readline ; then
- # bug #432338
- sed_args+=(
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
-
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- docinto ${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- dodoc ${f}
- fi
- done
- done
- fi
-
- # Install bash_builtins.1 and rbash.1
- emake -C doc DESTDIR="${D}" install_builtins
- sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
- doman "${T}"/rbash.1
-
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 42bc8b7986da..b40a9a7c5e3b 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,6 +1,6 @@
DIST fzf-0.34.0-deps.tar.xz 16800704 BLAKE2B b518f7bff1ea533af32efcb0e5307580aa921bbc20383bbdb6601c0b2dd50e66a57609c99adb9f71d1d388d08cae22521fea67797036d5dab34c83c45dd719fb SHA512 e5f6db58b43e6e3cb9b38f5fb13ab39b7caa18828516d13b0c4623f11a8553a905d076ef9685abfd9c7b602715d677dae9897359148b5d289b05ad056c60d321
DIST fzf-0.34.0.tar.gz 214641 BLAKE2B ccb7f57df4305cf07dc8e0ba7384c3a446ddce083727ad98719a327150d853782bf781b0179d02f3f10664ffce501ebab55ccd2d5f61a2e690fa41f1d0f479c1 SHA512 6e2bd9a7c30862c09f627c73504f2a52951476abbd9af64941445862cc9bf783699cc9ccf215e25c49bbb3f9656841581b5805af4658b681b590ca14b5697331
-DIST fzf-0.35.0-deps.tar.xz 16796112 BLAKE2B 61c22a914bb1eb8cb6da1daf4b25a19d98e7b0dcd1575b47b6da995ae0fb5e5bc47612b7abafe2917d12b4900a69e604ffff87bf31f811de449522fe800af8f4 SHA512 eed0a0c5a48c5dfee2b6c4d3320280d75f19c16841e3ad731371060da55885c3ddd8d0490dbfc53a68f095dcff02727e8d804494bfa8edf6da041ffcb197dc74
-DIST fzf-0.35.0.tar.gz 218715 BLAKE2B 7eb4a36e481738e56e031ec6e10c69b6499bd6fde204f8bc9474f80b9c6371ca66ebafd5733d4b5de3f2a1fed0c7f2b9b8bbb97681d6194a79f6c82088d6c28e SHA512 8dfdee14b6eced0f2fffc717d6f4e33b93531002754cfcc6b915169feb5f0b62060addf26eb43af028d3d62cdda3c2581a878305ed2fd89f0b27622b6d813cbb
DIST fzf-0.35.1-deps.tar.xz 16796112 BLAKE2B 61c22a914bb1eb8cb6da1daf4b25a19d98e7b0dcd1575b47b6da995ae0fb5e5bc47612b7abafe2917d12b4900a69e604ffff87bf31f811de449522fe800af8f4 SHA512 eed0a0c5a48c5dfee2b6c4d3320280d75f19c16841e3ad731371060da55885c3ddd8d0490dbfc53a68f095dcff02727e8d804494bfa8edf6da041ffcb197dc74
DIST fzf-0.35.1.tar.gz 218773 BLAKE2B 79b95e23a85865ea9218a222eba522a0a9d7f042f9119b308bc711cccc5327098dae271ba10fff9619f3ba7bc88037c70459f1caf511d5069264b931c875c49f SHA512 4e32836aa331835b6a7370ea342d2ddfa47a2059f5f7c5eec0b2c0dc9fdede14940bf64977c91df201775b3f4a06763a92593df7a50693d04d13b1befb194753
+DIST fzf-0.36.0-deps.tar.xz 16806808 BLAKE2B f121b3000bc5a0d72ee5cb66f59f4f44c41af30f28ca935a607b424399d12dc762f25811aea999e5de126e2727f8bda614e026da6983ed535d048a7229a07065 SHA512 121c6b1be0cd3af752b11461a72c22e3bc55eec12c12367b354a4ff4d4dc75fb0215cf19cec52008473045c6330a4af71b2e3a14a9a0a124e18aacc1aaad97a9
+DIST fzf-0.36.0.tar.gz 229126 BLAKE2B faa04870b7654b1ffb2f1c453636e33eab94e682c7db4702719419a5eca5ea136c657179248dd646573a625f575c823f9dcfd0023a96390bbf689e7455224411 SHA512 8e87dbd3b5ae9e0dc6a76855f7c75c9b4edc8ce797b2cd4eda053c4e1d618bb9afb2b24602e01776a49e47a00f2cd803ed433043f0acec8d385f741b13583e9e
diff --git a/app-shells/fzf/fzf-0.35.0.ebuild b/app-shells/fzf/fzf-0.36.0.ebuild
similarity index 95%
rename from app-shells/fzf/fzf-0.35.0.ebuild
rename to app-shells/fzf/fzf-0.36.0.ebuild
index dfb1e1fbede0..688da9c01b11 100644
--- a/app-shells/fzf/fzf-0.35.0.ebuild
+++ b/app-shells/fzf/fzf-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/junegunn/fzf"
# For fancy versioning only. Bump on the next release!
# MY_GIT_REV is the first 7 characters of release commit, we truncate it
# after to make it easier to copy/paste.
-MY_GIT_REV=04d0b0223fd69984a07a641d0e228c0e9e534825
+MY_GIT_REV=20230117636c9dfa3ed6f6428c5bc4c51b02f60a
MY_GIT_REV=${MY_GIT_REV:0:7}
SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 94e814433d7e..01a566a15eaa 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 010c9ebd28ca..58637af832f6 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,4 +1,4 @@
-DIST zotero-bin-6.0.18-amd64.tar.bz2 69200236 BLAKE2B c1dc30b1c295652866068742051c5e42f686a4073fb1501d8d4e0eac2945d65205d92f65f2d2626ad279a7c1f073e22bb58b72ff5bd48497158de5587e753896 SHA512 c839ab2f34f946d2f58c544ca915b9e7386f115aa6a68ea95e0b7293e234140bb64118eac7640cbfa09592879b398db8c8be97da3cee3bab58e8ecbbbe09f9e1
-DIST zotero-bin-6.0.18-x86.tar.bz2 70892698 BLAKE2B 49f23ef1d2a682bb945bf4b43c52e05551414597e6d16b89cefcd07588d158d917c63a7014d23969b5590caf2c79bc8875d03e9e6b2d709ce168acd8420435b6 SHA512 d7c70336a66c208f636ea4c96fde3b1e6547b7f1422a328f24f1ab2e2f25fce21d0ab69a98c787d9ffaa6f70e02995231365c07bf8da0f145adec875d008aa84
DIST zotero-bin-6.0.19-amd64.tar.bz2 69255233 BLAKE2B b52b2d540e3a5ac2aa949d4f313bd83934a2c086ec56be0817f01f6518de1c3c10e991d8820cede4254ab2250d36ca5fc62353476832502efbc69aa92597d604 SHA512 4b18448b1f12ef52454cfb1ad44b724eb4fd6ae5a90c65703919ead460fb87c0c776ec610b057e0ff80b889d01c23c4a4264ea38d26f9074761deeb63406f51e
DIST zotero-bin-6.0.19-x86.tar.bz2 70911732 BLAKE2B d409d993551836ffc09f3e3b33a1b24055d409faa9137facb25500d13d12cbfaf59893ffaac60a4e8bef4d2ac2d8806eaad1b0c8255162c1e0e75b674c35b0f9 SHA512 e1bba3cc1c1f39d0eec0d8d26d16e26a9142e5c255a52e63ccf78b5341596619ca104610507bc2086f57c5da975c70bec43020cf0dfcb0bce6ad0f8b42e169bb
+DIST zotero-bin-6.0.20-amd64.tar.bz2 69268379 BLAKE2B 126c1499e375726cc25fb5ebe366137e11dfc288ac9e0d93680459e602378400419f82cc4ed6556d10973e1928c89a8711ac369203d221be94a291340a3f1f11 SHA512 c054d3bf344bb8ca5a762ef99d5e214158de02f70f248ca28a9a345273edfa9e93525e0cd70e2c2eeb7039714e310e6b24d04268eb608087cab738b849200b4b
+DIST zotero-bin-6.0.20-x86.tar.bz2 70930545 BLAKE2B 96c3b2df646fdd0401f1b7a6deb7061fe5c517e8a95f3c6cdcd8686473f12fc51f7847029784d827f929745d3e660b57d7de783e82809ce76f8868335f0d10ec SHA512 9ac5b251db998e0ba8a838441111c9e4c994feee40608bf2a7e6dc1b6d50a7585d6d9a9ffa4ba0aa1afbde94b2cfc4a32522d4bf79255cef729634354ebd76ab
diff --git a/app-text/zotero-bin/zotero-bin-6.0.18.ebuild b/app-text/zotero-bin/zotero-bin-6.0.20.ebuild
similarity index 98%
rename from app-text/zotero-bin/zotero-bin-6.0.18.ebuild
rename to app-text/zotero-bin/zotero-bin-6.0.20.ebuild
index 8f643569fc34..07c557e6c051 100644
--- a/app-text/zotero-bin/zotero-bin-6.0.18.ebuild
+++ b/app-text/zotero-bin/zotero-bin-6.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index afb361cf3c8e..37e99b355991 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
deleted file mode 100644
index 6a9513473bf9..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100
-+++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100
-@@ -877,7 +877,8 @@
-
-
-
-- for Archive_Builder use ("ar", "cr");
-+ AR := External("AR", "ar");
-+ for Archive_Builder use (AR, "cr");
- for Archive_Builder_Append_Option use ("q");
- for Archive_Indexer use ("ranlib");
- for Archive_Suffix use ".a";
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 329ae50704cc..657c98fc5f32 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-include.patch b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
new file mode 100644
index 000000000000..600f440b85f0
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
@@ -0,0 +1,66 @@
+https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2698
+
+From 20b5dbb6171604b151ec2dd8c56bef26cc27d201 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Tue, 17 Jan 2023 01:18:41 +0000
+Subject: [PATCH] Add missing includes
+
+These seem to have all fallen out of a recent Boost update to 1.81 which
+dropped some internal includes. All of these uses within columnstore
+relied on these transitive includes, so explicitly include what we need
+to fix build.
+
+Signed-off-by: Sam James
+
+--- a/storage/columnstore/columnstore/tools/passwd/secrets.cpp
++++ b/storage/columnstore/columnstore/tools/passwd/secrets.cpp
+@@ -12,6 +12,8 @@
+ */
+ #include "secrets.h"
+
++#include
++#include
+ #include
+ #include
+ #include
+--- a/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
++++ b/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
+@@ -18,6 +18,7 @@
+ #ifndef S3STORAGE_H_
+ #define S3STORAGE_H_
+
++#include
+ #include
+ #include