gentoo auto-resync : 01:04:2025 - 01:33:27

8 files changed, 177 insertions, 24 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1727712b993e..831227180b5f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 61b2850d6818..5c532be6ed86 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -12,5 +12,5 @@ EBUILD openhab-bin-4.2.3.ebuild 3202 BLAKE2B 191e133be6f3ff5ecc3916ec0543c8079e5
 EBUILD openhab-bin-4.3.0.ebuild 3204 BLAKE2B 7a0ece2883a709214845bad36f725bb8152fb9a56fa77966b0331d4a1b537f3d8219ccc4a24a6cb503dc3ee0251ec114d2133476ea90bfd26dabc4f6a30d66ea SHA512 39ff168e348b59598aa89284fb0eab01f82383334a0c85b10dddf5a4ae17f401be08991f98a042b1cd54c4b0f2b66e0b39f5e3d361c1b11f4fc7b0d314431cc5
 EBUILD openhab-bin-4.3.1.ebuild 3204 BLAKE2B b7626a73d772380198ab9aed92624d04b0b232d7241d19b36f6db150039dfbe29fa9be5abf9fd8572cc9075e5a0ea5232cd702df8961a87aebb1c99ed028907d SHA512 fe2b162cc24ee5ec8469258a486d4afcf8fcff2be4c5ec0b7806d41a7cb564ae5c56f84c16d9831376e04398f771c25711e8b65fe0f503acdc114a81add31a00
 EBUILD openhab-bin-4.3.2.ebuild 3204 BLAKE2B b7626a73d772380198ab9aed92624d04b0b232d7241d19b36f6db150039dfbe29fa9be5abf9fd8572cc9075e5a0ea5232cd702df8961a87aebb1c99ed028907d SHA512 fe2b162cc24ee5ec8469258a486d4afcf8fcff2be4c5ec0b7806d41a7cb564ae5c56f84c16d9831376e04398f771c25711e8b65fe0f503acdc114a81add31a00
-EBUILD openhab-bin-4.3.3.ebuild 3204 BLAKE2B b7626a73d772380198ab9aed92624d04b0b232d7241d19b36f6db150039dfbe29fa9be5abf9fd8572cc9075e5a0ea5232cd702df8961a87aebb1c99ed028907d SHA512 fe2b162cc24ee5ec8469258a486d4afcf8fcff2be4c5ec0b7806d41a7cb564ae5c56f84c16d9831376e04398f771c25711e8b65fe0f503acdc114a81add31a00
+EBUILD openhab-bin-4.3.3.ebuild 3202 BLAKE2B 191e133be6f3ff5ecc3916ec0543c8079e5a9d24bf9742f8b77614311ba283b5c721b6b6d1c5277c51cbb6d9df0d6e457a17bd50a649cc55f1ee6b0a0fb2be99 SHA512 2e68b4e81a369243feed0d3694da250c63903445f3adf4d5b05b5ff605366e08f348e3bab7dc79293f07b743351247e051cc963b97b5b741dc2809f5fd7d7b39
 MISC metadata.xml 432 BLAKE2B a7c9f6511d33dbe366c9ea95ed7dd79af7904ca31058e3f0fbf7549d375f9ab998cb85576b1d9e0dd879dcc44ee7e91ee1067c3846b654f7e40c8779f913b964 SHA512 afaa6a0c68e275a103e597e4a66674a2de465887e7c919178d0ce4ba29b04c3e6722f7c7148763b6ffbf85be73db6e3c80ddd68e87f8d0ee4a7d4a05745aa6e0
diff --git a/app-misc/openhab-bin/openhab-bin-4.3.3.ebuild b/app-misc/openhab-bin/openhab-bin-4.3.3.ebuild
index d03408ef3a29..ea77f87155c8 100644
--- a/app-misc/openhab-bin/openhab-bin-4.3.3.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.3.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 4c53768ccf31..f80e8bbbddd7 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,8 +1,11 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
 AUX screen-4.9.1-utmp-exit.patch 1220 BLAKE2B 007758c3de19f9bcbfeeb1883d8d9bc42f1fb91d3cf202f6336836f6dfebaf3aa645c4854181d3445159bd1972810eaa0fb9b95e902292ef09075023c018b8f9 SHA512 86ec2542d8d92feba5b9d2d8386a74edc64e101dfd74d248cfe10501f2e1839314cf9a76ed2b1b36a94126a50fb944a598a2cec39bd23c449ffa718ba6edcebc
+AUX screen-5.0.0-utmp-musl.patch 227 BLAKE2B b226efde724526c457ecd1a642ab42e3b4386e0769b07d83930ba40672174b7a4ef4ecc215f0353bf309759b780c8c1a624c1be61f95c9838f0122b928a2c597 SHA512 8175a1f7f07ec7931a940ec708ea278193903f1358e378b890c9c8586674fa94b392ea4adf1f84ef1e235a5e1c903bc54e9931772c660d8f91c9a8155d765716
 AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2
 AUX screenrc 10350 BLAKE2B eda2b07af1262e6c6a7151659ee139313a1cb4ebbce91ac5f4b63d0473a969c017c30037f000b4bebabf7d68a86d93c25ba744d61b976bea5c11b0e35f4dcd89 SHA512 5c98d305ba027f64a32a4c4de19eb9603f766318892db216c696949dd5b5ba654e7c2b25e0e6e69207ba8e794b71cf515308103f265d06bbef85b18fece0d31c
 DIST screen-4.9.1.tar.gz 1040785 BLAKE2B 27d9c100bc1f747e39e109a4957702388d943c7d3b75b4c59dfc3894456d5249257742106fb24cf6f07a36764db0a1c5f7e0a44123edda1c570d771d7f46c638 SHA512 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126
+DIST screen-5.0.0.tar.gz 895882 BLAKE2B 5ff218afc1692ae201776f759ff2217a51dcf02202e4ba5d12de50a768df83e0e2a7a3511a5f85a3b21362892f31a4fd90d6444918915165ae12a8c0c2b3af39 SHA512 18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117
 EBUILD screen-4.9.1-r1.ebuild 3825 BLAKE2B 1eeccb1be9257c0252d275a79ea82f522a0a9b5db1c7df1cc8c94d79cb61b907d8b8b2dea627e7104a0fc53870903d808451f01a97124e54992bd26450207c5c SHA512 6eebcb4fa01becade1860bfbf60c7582c07a0a68f1b8950b10d580abd88179e638d70152f5bd92f6f7dc4acc3194808272df2df6d45cbfc999cbd4143f208e22
-EBUILD screen-9999.ebuild 3695 BLAKE2B 84f536f80f4f8f0749fc6eb390ab052f13af129478a526110e09534a601c9ec17de2e80e722d103d17ff63d3ce9aac97466bffbae99ed55ddf417443c89e77de SHA512 5d33319159800b3d3af1fd8ac166e36f55986ae1a6f760dc5d527aa9b04ed812858b3d059444ef96f26d2c59d6b4b5f81585ec513f1871b63d97e89980245eea
-MISC metadata.xml 1950 BLAKE2B e774b14285910f8641e9f3d2908378af5143497eea9153705452674d3e2c20d685fb5df351ab8d0be3afb9c7c7a626b4c5435b18599b07e1d24d4afe7e19af42 SHA512 48af1b145bbfcff379ff77336cff40ca32de5b5e00dbf275cfafd94d8d2d774a7d3ca741a1ecf79fb5d979f0729fcbf929213dad7f695b16be1bf53bf3771e75
+EBUILD screen-5.0.0.ebuild 3573 BLAKE2B 58d8e3f1e66703427e6275c7cc57319324e9ad460641971e48f872c5f7dec48b8657a7b78b11c154f9e75cbc17a137a034c702a5161d94c9be1aee2ba659556e SHA512 92c41695755fb0696e3b217c4da3fda4a3a33493c528685e0af46885d34bcf6feb92ae8652b5de492fae0c6d698d54acb64c405f85ea0830a2f02dd244aa54d4
+EBUILD screen-9999.ebuild 3573 BLAKE2B 58d8e3f1e66703427e6275c7cc57319324e9ad460641971e48f872c5f7dec48b8657a7b78b11c154f9e75cbc17a137a034c702a5161d94c9be1aee2ba659556e SHA512 92c41695755fb0696e3b217c4da3fda4a3a33493c528685e0af46885d34bcf6feb92ae8652b5de492fae0c6d698d54acb64c405f85ea0830a2f02dd244aa54d4
+MISC metadata.xml 2034 BLAKE2B 39d0b96b4d1d799455dad94ef9f1981e2a95fd21c32a05f2380c574dff1f1427f292a780312f9d1e001c10fbe2086c310bdf1c64f42b6b5c9728eeba3dca1b86 SHA512 5ec877fa532365521dc35a6e6333b890537c76e27a33d76cf4c93ca0e0f296508f5f75354f8a5cfa3d46cf5b8c97e1f3fabb25095532c8c9d162690a24554f80
diff --git a/app-misc/screen/files/screen-5.0.0-utmp-musl.patch b/app-misc/screen/files/screen-5.0.0-utmp-musl.patch
new file mode 100644
index 000000000000..de3d2fb71840
--- /dev/null
+++ b/app-misc/screen/files/screen-5.0.0-utmp-musl.patch
@@ -0,0 +1,13 @@
+
+Patch from: https://github.com/void-linux/void-packages/commit/0f6da07
+
+--- a/utmp.c
++++ b/utmp.c
+@@ -30,6 +30,7 @@
+ 
+ #include "utmp.h"
+ 
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
\ No newline at end of file
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index ff53fc5f118c..fa0bcd20aedd 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -29,6 +29,7 @@
   <use>
     <flag name="multiuser">Enable multiuser support (by setting correct permissions)</flag>
     <flag name="nethack">Express error messages in nethack style</flag>
+    <flag name="utempter">Enable support for <pkg>sys-libs/libutempter</pkg></flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:gnu:screen</remote-id>
diff --git a/app-misc/screen/screen-5.0.0.ebuild b/app-misc/screen/screen-5.0.0.ebuild
new file mode 100644
index 000000000000..0b436bb9d018
--- /dev/null
+++ b/app-misc/screen/screen-5.0.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam tmpfiles
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ ${PV} != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	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"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug nethack pam selinux utempter multiuser"
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	acct-group/utmp
+	selinux? ( sec-policy/selinux-screen )
+	utempter? ( sys-libs/libutempter:= )"
+BDEPEND="sys-apps/texinfo"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.0-utmp-musl.patch
+)
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' canvas.h sched.c screen.h window.h winmsg.c || die
+	sed -i 's:sched.h:_sched.h:' Makefile.in || die
+
+	# Fix manpage
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 || die
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	local myeconfargs=(
+		--with-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-system-screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-rxvt_osc
+		--enable-telnet
+		--enable-colors256
+		$(use_enable pam)
+		$(use_enable utempter utmp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS*
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	emake DESTDIR="${D}" SCREEN="${P}" install
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix ; then
+		fperms 4755 /usr/bin/${P}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/${P}
+		fperms 2755 /usr/bin/${P}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+	insinto /usr/share/${PN}
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	if use pam; then
+		pamd_mimic_system screen auth
+	fi
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	tmpfiles_process screen.conf
+
+	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 7ad57bdfa000..0b436bb9d018 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic pam tmpfiles
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
@@ -20,19 +20,19 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="debug pam selinux multiuser"
+IUSE="debug nethack pam selinux utempter multiuser"
 
 DEPEND=">=sys-libs/ncurses-5.2:=
 	virtual/libcrypt:=
 	pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}
 	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
+	selinux? ( sec-policy/selinux-screen )
+	utempter? ( sys-libs/libutempter:= )"
 BDEPEND="sys-apps/texinfo"
 
 PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${P}-no-utempter.patch
+	"${FILESDIR}"/${PN}-5.0.0-utmp-musl.patch
 )
 
 src_prepare() {
@@ -40,9 +40,8 @@ src_prepare() {
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched\.h:_sched.h:' \
-		screen.h winmsg.c window.h sched.c canvas.h || die
-	sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
+	sed -i '/include/ s:sched.h:_sched.h:' canvas.h sched.c screen.h window.h winmsg.c || die
+	sed -i 's:sched.h:_sched.h:' Makefile.in || die
 
 	# Fix manpage
 	sed -i \
@@ -53,13 +52,6 @@ src_prepare() {
 		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
 		doc/screen.1 || die
 
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# disable musl dummy headers for utmp[x]
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
-
 	# reconfigure
 	eautoreconf
 }
@@ -74,17 +66,21 @@ src_configure() {
 		append-cppflags -D_XOPEN_SOURCE=600
 	fi
 
+	use nethack || append-cppflags "-DNONETHACK"
 	use debug && append-cppflags "-DDEBUG"
 
 	local myeconfargs=(
-		--enable-socket-dir="${EPREFIX}/tmp/${PN}"
-		--with-system_screenrc="${EPREFIX}/etc/screenrc"
+		--with-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-system-screenrc="${EPREFIX}/etc/screenrc"
 		--with-pty-mode=0620
 		--with-pty-group=5
+		--enable-rxvt_osc
 		--enable-telnet
-		--enable-utmp
+		--enable-colors256
 		$(use_enable pam)
+		$(use_enable utempter utmp)
 	)
+
 	econf "${myeconfargs[@]}"
 }