gentoo auto-resync : 06:10:2024 - 04:27:04

11 files changed, 206 insertions, 6 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 616e66ee6728..484e00522f94 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index f0b42a2d976e..374300883054 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,6 +1,6 @@
 AUX cracklib-2.9.11-py3.12-tests.patch 3388 BLAKE2B af1ad743eea771cbd3465aa0c5cc3ba9832bf3f3aab0c6fc229f65c14f4e1b056d2655e0af4d02ff0edc033e79f7f7a884fec4bc4e579dd13fb7cad0bf4bf91d SHA512 c8b0e532af7c518d5c87ecc161ae2fa9380f2b5ab61b658a839d1629f7441f8079ca00979332825e195fc5ae7c194bf03a9dac3852a1f5de94dff2c97eb989b6
 DIST cracklib-2.10.2.tar.xz 465152 BLAKE2B 87ea88085fee30cbd6e59485f157b7c6213e21619ff8af20ed33c118fd4be78cc9fc5b8ac5d583391df7a3bd527671044410d0e5cfe1cf864c0608cd24a8ca0b SHA512 b58f513bb3094821a69e45c092483d7445ecd1ea2d4d70b6cc422c58e478146f4656fc1ddc0b276f1da31a858d2baea4cca233c9232e2acd05085d55873f3273
 DIST cracklib-2.9.11.tar.xz 461116 BLAKE2B 46b499e465c1c268b772781a9c8ce573a5167ae2e0ac919b403acdb9a14c35140dfb53909eef6e41600e26c2f87d905b3d6d05380c66f053d091765b58a264f4 SHA512 c32e509f757344a1f0b7032ad3b6dc47a8759852a94e511c92073d85bce55f45d48c389d9eb34c993e1d61ad5c1542150672f3e8bc147148ebbb04d3319a2409
-EBUILD cracklib-2.10.2.ebuild 2983 BLAKE2B 4aac75d26973223cc078d0ab502c97f5599fa1d9ce4b3ec5dadfc55ccb13db5507e994b7b189b7fd1441a67705439bbbeed2708336c63027cbd4e17d22bc077e SHA512 04544cef89330cb9a4e35b54c139b95f82ddf3a6202ef291baa4421fda8a7adf2b83bcf228f0eef601b93082de9c378d6e96993dbbc703f4b1f29ef9655159b6
+EBUILD cracklib-2.10.2.ebuild 2979 BLAKE2B 2e75ee02908866719fa499f31ecc62456c9b9f219323077e8246e56f49d5543607b12f5694cbd1d533a46aaf0b55dc64115e557b4c1382e5bfb3f4368744306d SHA512 124c41ce18d378f33a1849e26b33f4bfb62202f762a918c3621131698ec5363b298c1d39961578988d71ed1abd0370fb5a03fab414788f720903f4fb24da1f69
 EBUILD cracklib-2.9.11.ebuild 3027 BLAKE2B adabf7191c64f0a061bd669e4c84582a6bba996f1018719f22c2571be84d5f5a854270af0a2418893288f1317d067204692feafc0df57f2e107ac2e26ba113d8 SHA512 5377beb7bc0b9cee79836489bca1aed3544476100c7d128b5f390b4d402c4021aac9fd8619d369f354f3c05d068869b5d3bf321fea1e0e0388251ececbea7e88
 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796
diff --git a/sys-libs/cracklib/cracklib-2.10.2.ebuild b/sys-libs/cracklib/cracklib-2.10.2.ebuild
index 13f5dab1a076..076b8431624d 100644
--- a/sys-libs/cracklib/cracklib-2.10.2.ebuild
+++ b/sys-libs/cracklib/cracklib-2.10.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 411e0e0f04cf..e93101e17af5 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -9,6 +9,8 @@ AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e9
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
 DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120beb21f2dcfb083bc9779a4541856e08ec6e87549651ee3c9b62fe54521585e192c784254dd9482bf9da09935853ae SHA512 90b6b78cdd119c2a1f332f007333aa6df70c6e3de0fd81ab007025392ee7cb7a01ab4a7a174d1f2e760c55d78f21ebbbe9667af661ccdd669e4b54edb1346937
 DIST freeipmi-1.6.11.tar.gz 3429533 BLAKE2B abc803341db4e48fe1a81da1d9cce2e7a808e51f41fb5b18019fa25bec41b443275f737553fe8b7bfd1dd9ad06d08b2097ca9f8e78a431e20d1a0e89d0e8cda6 SHA512 db37bb1ec559f88764ac08491b616d24e49c9a8ba070717e940fea4886d877819064cb00221aac703d0d149dc38e562924e192e992222e18b0e8b548248487a4
+DIST freeipmi-1.6.14.tar.gz 3464254 BLAKE2B b0b3fdc45c910f5fd3e837b4186103c754fc399c05be6b3406346a9629de4392334dfce5320fabfa895f8d398399a54b58c8b6663979e428c10269dd57b35067 SHA512 5dab6430d257776cad1aed39cb2e2536af42c56e3f53774111efc15b0dfc19241eedfbcbfb1f088dd8be38ce694bff9779050daaec9ad0b2d4dad329ce8f3fe3
 EBUILD freeipmi-1.6.10-r1.ebuild 2988 BLAKE2B 93ef70d463f5953d4767d77dc0b5c86608e35467b88d82dc117f9d8c3fc2125e7a50b09af894d9dd05be191e5098f9aad0d55cafda4d674404360b61e1da01c0 SHA512 4ba941a27940b9c595dcc0e254afe4506987626def549610c188b806c2cbdce63820e0c47129c2f1e25862abd3ae6e9e33816560c54347697cbf12cd669bd872
 EBUILD freeipmi-1.6.11.ebuild 2578 BLAKE2B b8f5dfdd537399ce03b1d781c5ad6ae5aff19ae3b96f91b61181d65b7f23eea5d7c63e5caf56a67eb55f434dd79f10655a6a682395c016f394dfb1b991bf0f2e SHA512 e3266274dd8b9c5929d9f07fa114b94a14684b6b90819faa448e697a87528a2caad4142efcbf27a441704b7c613eaf1d6731912f00e338b7c756c7391b78cc74
+EBUILD freeipmi-1.6.14.ebuild 2581 BLAKE2B 560722c7ccf6fd15c14ce84acb45b61050ee9e1a5a9d2cd042a7e956837140afea99647db45812ab4b77077ff0f8c4fccbea9d2b1b384f6a67fff81e33b436f2 SHA512 4c415eb5517b8b5b1ce64fbc02db961a48593169b049dc728feccc827bda57a9fbfd8e6941cea0da3e92df4e1126c961bf5d1e1ad99f7db18a0cc08bd82ce68d
 MISC metadata.xml 569 BLAKE2B 80068547ab42d075842e19f6ca65c9aa4b7c25aeddffc01a179e02fd6364804eefe3b7aa26434756de638f22a19da815d8b930a7d5bc81048e228ee72c81cd3a SHA512 f910ad6c63c49a2f2ddadc82c202cc9cf414eda5babdbe675048c6a5c2df4f093663ff8cf99da69563d4c67fa8bc0c18bfb9a8b8a752f8ce63bd1de8feed52e1
diff --git a/sys-libs/freeipmi/freeipmi-1.6.14.ebuild b/sys-libs/freeipmi/freeipmi-1.6.14.ebuild
new file mode 100644
index 000000000000..cc75a615f9e4
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.6.14.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P="${P/_/.}"
+DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
+HOMEPAGE="https://www.gnu.org/software/freeipmi/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="debug doc nagios without-root"
+
+RDEPEND="dev-libs/libgcrypt:="
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND="
+	${RDEPEND}
+	nagios? (
+		|| ( net-analyzer/icinga net-analyzer/nagios )
+		dev-lang/perl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.10-header-fixes.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable doc)
+		$(usev without-root --with-dont-check-for-root)
+		--disable-static
+		--disable-init-scripts
+		--localstatedir="${EPREFIX}"/var
+		ac_cv_path_CPP_FOR_BUILD="$(tc-getPROG CPP cpp)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# freeipmi by defaults install _all_ commands to /usr/sbin, but
+	# quite a few can be run remotely as standard user, so move them
+	# in /usr/bin afterwards.
+	dodir /usr/bin
+	local prog
+	for prog in ipmi{detect,ping,power,console}; do
+		mv "${ED}"/usr/{s,}bin/${prog} || die
+
+		# The default install symlinks these commands to add a dash
+		# after the ipmi prefix; we repeat those after move for
+		# consistency.
+		rm "${ED}"/usr/sbin/${prog/ipmi/ipmi-}
+		dosym ${prog} /usr/bin/${prog/ipmi/ipmi-}
+	done
+
+	# Install the nagios plugin in its proper place, if desired
+	if use nagios; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		mv "${ED}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
+			"${ED}"/usr/$(get_libdir)/nagios/plugins/ || die
+		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
+
+		insinto /etc/icinga/conf.d
+		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
+	fi
+
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
+
+	keepdir \
+		/var/cache/ipmiseld \
+		/var/cache/ipmimonitoringsdrcache \
+		/var/lib/freeipmi \
+		/var/log/ipmiconsole
+
+	# starting from version 1.2.0 the two daemons are similar enough
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
+	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
+	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/ncurses-compat/Manifest b/sys-libs/ncurses-compat/Manifest
index 2765f89a9ef0..f45a6499a105 100644
--- a/sys-libs/ncurses-compat/Manifest
+++ b/sys-libs/ncurses-compat/Manifest
@@ -143,5 +143,5 @@ DIST ncurses-6.4_p20240330-patches.tar.xz 63796 BLAKE2B 3e6618ba0b37268d10a16cf2
 DIST ncurses-6.4_p20240413-patches.tar.xz 63760 BLAKE2B 6a91d453cca3705ca54b3a6f2ef00250d655168c1697726db4b581a1597cbc143479b8794e176d5e4154c794f99ea33c3fe1eb26605789930fc82649a2da3c93 SHA512 59239503a9400e054641428528799aa9c13b12669b31f32b2ff18cb60882698801e04dcdf75ece8357c7a4c3b899a729aa973090ec12a20de72cb80a916878b8
 EBUILD ncurses-compat-6.4_p20230401.ebuild 9849 BLAKE2B 4f9c95f12c597ff68ae3a1f5c0f0a30abdd9f34d020eb87ed9ce3de3519fe30bb0db4a27f339f7b727ddae0fe95e373624e1869794e102736326db912719df25 SHA512 b0551e6f0b06733c691e83490076b1e574dc0372897f3a71df01477c3ca70643a6240dc89503a9fbc541e0fe328a2583d04c81565952deaad69c2cb11c61e2ec
 EBUILD ncurses-compat-6.4_p20240330.ebuild 10486 BLAKE2B 9eaf4363a32b6c5571fcba734d0f2a20f4bcc26e6b7cff8edba298583c23db9f659dffc1103637e202ccbbbc8eb45656afeef608c52cf6e2b2c9c705e2c7cd9f SHA512 30040aa804a86be4afea1b09b24110cb23b2cee013177a6e0656444367b0e2eaca7f10bd7d4894f0f0d1d44694ad85c8e554f164c5d98f1c1e217e42517dd908
-EBUILD ncurses-compat-6.4_p20240414.ebuild 10515 BLAKE2B f249c0b7b6d33e931c0b51fa06ed0e9c382ed19a3ed7677ec8c1ec969c6f04545c9c2b224459f65f554ce486420ad4e8a439b6131628b023b7d0be2c04101218 SHA512 6a77404944f58153ea6f34bea51e432815b6cae49d497631f04d79555314f72d88dab7f4b65ae44f5d3cc9e120ead046a921a65e0677f02fcb9cc17d441a0b2d
+EBUILD ncurses-compat-6.4_p20240414.ebuild 10511 BLAKE2B e257f3ea4024e0bb13017eef5d244ce3c9d2b38142c977ca71b8b8b5f01cd8fdeabdf8f1e1a81c44d9145b48a7b1f050626f69f9cfb0fd082f0996624c65a44a SHA512 f675ace6d921cf462c186dfed5108f8c5c4920db6b742f05eccf9c8d32f700a1d23296768fa2840cc68ea37ff579f3f9e740960bfe40cfd1c542a4324288c237
 MISC metadata.xml 949 BLAKE2B 02d84363ace3523a818cf986afab5b7ddc3034d8fd1e365c054f802e944601ea4b4d579a27d06ddef9045730f05d5b901eb688bd7a53e341363feb7065318420 SHA512 3489cb9d8f931f74e898bed2d7bf6ca29934b9a5ebf3f58b8d3f1b68c87fc3cb7804cfefce2b1369ec0b6bf2e7ec22dc43e07920d99d4fc9edec0a970bf7be87
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.4_p20240414.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.4_p20240414.ebuild
index 9628822ce31c..7c22fd35d218 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.4_p20240414.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.4_p20240414.ebuild
@@ -156,7 +156,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 # The subslot reflects the SONAME.
 SLOT="5/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gpm +stack-realign tinfo unicode"
 
 DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index a9440601ff2a..b075461143c3 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -1,6 +1,8 @@
 AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659945bd7d85758342438f261fedce67bace7795a74ff6010f68d04d8ae33936b6c60780986c9e0d66e93061577132f SHA512 2deae71fd039126cb3dd0a348658ddbf568345c782c2467a4712d36006217f86eaf86950c821d36a400aea4cf18409684e8abd3b1e504928f5bc6d4cf943c4bb
 AUX openipmi-2.0.33-c99.patch 2031 BLAKE2B 0a84beca0c7cefef2f690a99dd99ee8bf6213b8399f27154e4377f1f343f576557977e7f61b421d67aadab8bb087e8ba09b21b31dbe194ef464fd0e393b0b0d5 SHA512 695d2c89aca9bcaef732e8541e37129240be21d164be38c0fedd6e34d111b6cee0649eb2e265dc468502f592d286b7ea5048fccb94ab547e9c1e0ccd373f6d68
 DIST OpenIPMI-2.0.33.tar.gz 3141439 BLAKE2B 02634ac8e17abf6a95f37e1b6825fe1f493e1990d7a5b0f6e87f7d9527f2a778f9faf0b12566529a3c87ecce893346e5125c51da988b95fbb56145282194ed16 SHA512 615fccd1ffd4af18584c1b0e54667ba2de60b6d42b44e7448f27808114180fa3b31b4834276bdf69c3df1e5210df871fd888deec8186377524838390fe41e641
+DIST OpenIPMI-2.0.36.tar.gz 3149501 BLAKE2B 9ed690a5824caa5d1f588f65625e1db9b79b3d03c8e828e9ffb549396264530ab28f3ec86705053446a6f91669a03165e9de7b2764c1f38733d33a0327c26e1c SHA512 a47725308336f200e88a1eb8641ed5ef03fc8bb43ee47f7a99e39df68640ff912b6842c1710d7e767aeb724fc41fa4ed3b244685812ee985e5200003a45f4015
 EBUILD openipmi-2.0.33-r1.ebuild 2118 BLAKE2B a314173bf0982d86615340a4892448c4f976961140b153f19c6452ed3684a79145ad030aac4ce602256576f4518fef8ea11112332e183655b139fdf04096e2d0 SHA512 02c576d0bacba82a62feefcb27b30e055b199390e5a98595c9d0ef2b0a98f91c8d2a93792e90fb5945a924967b4f9d0dfbe89a0834b6c8c2ab23cccaaff5395c
 EBUILD openipmi-2.0.33.ebuild 2079 BLAKE2B 7a09a880d1bec77069ed690bc3c415c108d518d7148b691d1e0d06a652cf8f928cd9cc70c424104655c6bec3c8975bf08ed276eee42da4b9e68b27f6c29e38ab SHA512 cdd54b07fb61f6836384f5f2d85db2e5f488fc8484260823b9a4a31254717ee2e373ccf73593cb478226295af8ecd91d2a3ab556703d1267df002c3c556b526e
+EBUILD openipmi-2.0.36.ebuild 2086 BLAKE2B 4c1f4b16aa3d8b87a38d354e475152cb879fcb6c1799f495268273fa75e9ee2cde16b0a800c3f1d38c96c67a8911d50e0c802c91c8fccd968db7c7bc2700c749 SHA512 d15a295148bed2baa4aa701120866d64f76130a483694da33301a1606d02a671679eac36fe8cf041d3d9ebe436561b8075cf9dec2bb88f4dab8506d2557d2006
 MISC metadata.xml 348 BLAKE2B 845b9eadd51770ff89268871a3cbb7befb724efeaa28b891e510f34f3bb80b8c72f937505b31646440da9581fa37a38f6272b37f424e78b9ff5c832c255e9bfc SHA512 c13f3458e198f1d4da1cf5be846df5d2cc2ca3ef3fecd5959f7fed0979f10d0eff326da380793dc4471d64e622a415ca60b144b92bb2889a0f870e0c2767f917
diff --git a/sys-libs/openipmi/openipmi-2.0.36.ebuild b/sys-libs/openipmi/openipmi-2.0.36.ebuild
new file mode 100644
index 000000000000..3cb33aab7349
--- /dev/null
+++ b/sys-libs/openipmi/openipmi-2.0.36.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools python-single-r1
+
+MY_PN="OpenIPMI"
+MY_P="${MY_PN}-${PV/_/-}"
+DESCRIPTION="Library interface to IPMI"
+HOMEPAGE="https://sourceforge.net/projects/openipmi/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="crypt snmp perl python static-libs tcl"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	sys-libs/gdbm:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	crypt? ( dev-libs/openssl:= )
+	snmp? ( net-analyzer/net-snmp )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/swig-1.3.21
+	virtual/pkgconfig
+"
+
+# Gui is broken!
+#		python? ( tcl? ( tk? ( dev-lang/tk dev-tcltk/tix ) ) )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.26-tinfo.patch" # bug #501510
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# For tinfo patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# These binaries are for root!
+		--bindir="${EPREFIX}"/usr/sbin
+		--with-glib
+		--with-glibver=2.0
+		--with-swig
+		--without-tkinter
+		$(use_with snmp ucdsnmp yes)
+		$(use_with crypt openssl yes)
+		$(use_with perl perl yes)
+		$(use_with tcl tcl yes)
+		$(use_with python python yes)
+	)
+
+	# GUI is broken
+	#use tk && use python && use !tcl && \
+	#	ewarn "Not building Tk GUI because it needs both Python AND Tcl"
+	#if use python && use tcl; then
+	#	myconf+=( $(use_with tk tkinter) )
+	#else
+	#	myconf+=( --without-tkinter )
+	#fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README* FAQ ChangeLog TODO doc/IPMI.pdf lanserv/README.vm
+	newdoc cmdlang/README README.cmdlang
+
+	use python && python_optimize
+
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 54841902c9c2..aafe3471f5e9 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -42,7 +42,7 @@ DIST readline82-013 5757 BLAKE2B 5af309dc331cdc2fc9c47f8a53c78731885cf70ba22c135
 DIST readline82-013.sig 95 BLAKE2B 388b707e863c6047fdc92bb29e2c172292b497f53926f6e2534016e5cdb621fd7feb9418c6edd4a693869ea61c16cb64815bf2159d6af0bb3eec5d5dc666e525 SHA512 85bd30dc816d62a2e339c95bf9f243a60a960264e14bc396b34f586afdded2cc43ecc307a7f1a2c03c7eba2d11d2f3a0028107a59c4b2bc8d6dbe77fe9fb81cd
 EBUILD readline-8.1_p2-r2.ebuild 6975 BLAKE2B e6b022db819ee9cfb347cdb66a6a8e7ca68ee77440d2cacb5f94e81748e3067a6db583501eb0237597a3360c7b1b084197d870332fa31889c2813d39133fd5a0 SHA512 e9e544c3f21e85d2aa3354070e489dc7e013f09b06a450f2d610f791d78885a5e08de5df199678d204b82a86fd35e4eb94b8b50747ddb1ae353860da7eaa0b47
 EBUILD readline-8.2_p10.ebuild 7553 BLAKE2B e38548489777633d6094a73e5f56fd291fad1d8c81b9abaddf06b5f8438573727e5cbda0adfadd5938e2ecfc9217c310f81b826a2dd2cdf35df969275a12e338 SHA512 056a9f5fefb2d7076869f28e14a56a36270a32b8004eb2d146dd209ef42551067f746ebe6ed632e916084ea5724705bb844be4348e8967c236177217d038ccac
-EBUILD readline-8.2_p13.ebuild 7561 BLAKE2B 191300fca5568a21b5ecc0218394a993276a98785d09cd5daf49e51b2cb5bcefa0a5209e23051569fe0778ea800dd7c4239f30188db67f9adb34780de11e6915 SHA512 ba8d9d0c093a9e0695aba2504d6c51c2167a7ad3c13bfd924d4fcc5aedc48ee334a74b769948b9f0351b9b2f9c73ff373510bfd146c0cfad0de0735a5839675c
+EBUILD readline-8.2_p13.ebuild 7557 BLAKE2B 96fd07172b863bdc7f81088656f67b71dff960ef6a2a1a3463c4af63fc64eec05a28e2e79a8cfef89d46d7f3bacc43b3e2ab44fb8dc44fc0243d6b1ac9048355 SHA512 585c7211af6c5a03b75683d0c0645ef545c221dbe71691a4a73e1b7e8494b17088d6bae75caf6f3c7ef98f80162f1f70fde63665824874d1f277852c17637366
 EBUILD readline-8.3_alpha.ebuild 7664 BLAKE2B c9c4b48462e671d26ddf981986b0310e88305e24990e1e312cf5bf48ec0e1a5310af059d6c91a3c7ab41ad4350275ddc3a96c517ba7d5fe8916c9468c3078e68 SHA512 6413171f101344d0896aaf5a9d592b7cbe55a337c780b537ab1b3f476a9f35e78446feda3e8bdcbeafa8c212ecce6066d7edeaa8121ed6d00b497df076bed95f
 EBUILD readline-9999.ebuild 7385 BLAKE2B cc0e30f63579388c31751fc4f1d99bb1ef130fb9ea41addfa123df52227df64852b19b147b96f9cde4b447bfd843f0b1bd1cef2241d9a60da94b03722573e135 SHA512 776eabe24d667b43f7be86aaa49f8fe9b72073639c8d7342ce576c5e832fa33311fdbd3d72c7255047dd7f442d5cc9d7fcbdb4d720be336d56f9a6928b587d68
 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
diff --git a/sys-libs/readline/readline-8.2_p13.ebuild b/sys-libs/readline/readline-8.2_p13.ebuild
index 38df3c2c67f8..5a7a547c569b 100644
--- a/sys-libs/readline/readline-8.2_p13.ebuild
+++ b/sys-libs/readline/readline-8.2_p13.ebuild
@@ -83,7 +83,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="static-libs +unicode utils"