gentoo resync : 20.03.2022

4 files changed, 43 insertions, 44 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 1a26482179c0..3b9909d49a34 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,10 +1,11 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
+AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-DIST screen-4.9.0_rc1.tar.gz 812374 BLAKE2B b908ec64f932dafe34cd0032fd59da9352cf9e7a56cce06c6b2664a84a25637cfc6679f73bfb47e0cacb590739bfa9b61125d942e63f2cb2ae1aaa1b1a2dea8d SHA512 1f87ce0bc1cbfaa8fd7437eee707de8e047bb8f110c26d40f5cb7916816d10ea1830281c680189e855af9cf2f4e712dc08a7c480961d9aee9ea4bb092557b508
+DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
 EBUILD screen-4.8.0-r3.ebuild 3848 BLAKE2B e861b10538b50fa4d53a9b42fc3e69409c2a9d6e24d4f757b9905fc2f48b2ebcc94066f7c7b25f5dfc0c6661b696ca878b9a4a8fce694ed847e6e0eab2095112 SHA512 5c51dde15eeab2e1f0dbf3120ee20cdc1ec22666ad62bf4b86a9db85793d1293673071d2a5cb620726abbba6b2318f172248d381383338b23ba89f1e03cbef3b
-EBUILD screen-4.9.0_rc1.ebuild 4136 BLAKE2B e3aac75b33b91ff2febf1155901e8ef173d5da0613249288dffa03713b2d0790b74b4997809696eb0ef4172f64ed3772c8c578edcc584c7df1876b2391556e40 SHA512 615d9df8ce8b6c15716df5f26e3789d9f056f011a7896279153fc13f2e036237b0ff31a6d4cbd78c97f61600e1e974c3d8f666b305ba6eee5dae2897576cc1d7
-EBUILD screen-9999.ebuild 3911 BLAKE2B bc3d9c871ea0659fbc880229bda56a541b7bda70e26270cbd621e38b0887e7da0d0c89c9a8038f44c0f9ddc2a16f663fe0079590d4ab5affce11d45847563070 SHA512 69dbb37a84024e208fce48cc9804f0c2a0ca2f1cd039ead9087a3d994348d1d1f143832b53f62f769a9263a696a17ab9734d39b38bc10c8a2e9ccea559dd1ced
+EBUILD screen-4.9.0.ebuild 3777 BLAKE2B ea63c9443397727218142acd84e409ac9cd69f5a8d92c583a0e5824b8f94af0394323151bb24c6f45c0c5df522b4b10bd8fa6f3dd5c3f4075c71b6340cdb5185 SHA512 9cf35db49d764588d27033ec3db1096a0cdba85b894051d3762dbb1d821029a37c43b5ee96f26dc612572f05afa425d0159487a28f05a9b01d49ccbaf60ccf39
+EBUILD screen-9999.ebuild 3781 BLAKE2B c70c76d9f0d0f1ea8f7af9d182e22dcb381d9e0ef0f134b27e72e07a3be90e387efe0856dff3459ce04e125dd0e555e83df1e5e32c93bce84ccb7a6b1ee7f6cd SHA512 b503a8ebfdef364fed0acbac79f0960969c668b68243c337ed12a814e7b796cec4235a4faa2c6bae84cb20d6d866547aa3e2b1d4dd242be328cbda43a9c7f188
 MISC metadata.xml 1783 BLAKE2B 6b1b392339f6786f95c151a7f311c24adf76c32d23e0f5bf50ff97571ab7e0a7b878d1ccac6938a01c2783c4f54eb0644dfd1f35b9bc602590fce96eed4a4e99 SHA512 fc4a716f118ab74b7757035ffadaaeebd47ba512a8ff123a7f5df4fa8fd2b384a66d4da88f8b78e7c16314b710e2346cfa6fc644c22f059d065cc1778565d060
diff --git a/app-misc/screen/files/screen-9999-no-utempter.patch b/app-misc/screen/files/screen-9999-no-utempter.patch
new file mode 100644
index 000000000000..7eccc30c04c5
--- /dev/null
+++ b/app-misc/screen/files/screen-9999-no-utempter.patch
@@ -0,0 +1,15 @@
+--- i/configure.ac
++++ w/configure.ac
+@@ -151,12 +151,6 @@ AS_IF([test "x$enable_utmp" = "xyes"], [
+ 	AS_IF([test "x$have_utmpx" != "xyes"],
+ 	      AC_ERROR(Missing utmpx.h))
+ 
+-	AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-	AS_IF([test "x$have_utempter" = "xyes"], [
+-		AC_DEFINE(HAVE_UTEMPTER)
+-		LIBS="$LIBS -lutempter"
+-	])
+-
+ 	AC_MSG_CHECKING(if utmpx struct has ut_host field)
+ 	AC_TRY_COMPILE([#include <utmpx.h>], [
+ 		struct utmpx u;
diff --git a/app-misc/screen/screen-4.9.0_rc1.ebuild b/app-misc/screen/screen-4.9.0.ebuild
index 6e0c5455bf0e..18779966236e 100644
--- a/app-misc/screen/screen-4.9.0_rc1.ebuild
+++ b/app-misc/screen/screen-4.9.0.ebuild
@@ -3,21 +3,14 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
+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
-	if [[ ${PV} == *_rc* ]] ; then
-		# See https://lists.gnu.org/archive/html/screen-devel/2022-01/msg00010.html
-		MY_COMMIT="d591a396c7e41d10191c1f5676032d9e261da2f7"
-		SRC_URI="https://git.savannah.gnu.org/cgit/screen.git/snapshot/${PN}-${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}/src
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
@@ -29,15 +22,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"
 
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
+DEPEND=">=sys-libs/ncurses-5.2:=
 	virtual/libcrypt:=
 	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	acct-group/utmp
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
+BDEPEND="sys-apps/texinfo"
 
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
@@ -52,7 +43,7 @@ src_prepare() {
 	mv sched.h _sched.h || die
 	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
 
-	# Fix manpage.
+	# Fix manpage
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
@@ -61,7 +52,7 @@ src_prepare() {
 		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
 		doc/screen.1 || die
 
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
 	fi
 
@@ -75,7 +66,7 @@ src_prepare() {
 src_configure() {
 	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
 
-	if [[ ${CHOST} == *-solaris* ]] ; then
+	if [[ ${CHOST} == *-solaris* ]]; then
 		# enable msg_header by upping the feature standard compatible
 		# with c99 mode
 		append-cppflags -D_XOPEN_SOURCE=600
@@ -142,8 +133,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
+	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."
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index e41146f416bf..abdf2c2458a2 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,49 +1,42 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
+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
+if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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"
+	S="${WORKDIR}"/${P}/src
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"
 
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
+DEPEND=">=sys-libs/ncurses-5.2:=
 	virtual/libcrypt:=
 	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	acct-group/utmp
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
+BDEPEND="sys-apps/texinfo"
 
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+	"${FILESDIR}"/${P}-no-utempter.patch
 )
 
 src_prepare() {
-	if [[ "${PV}" != *9999 ]] ; then
-		default
-	else
-		eapply_user
-	fi
+	default
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
@@ -51,7 +44,7 @@ src_prepare() {
 		screen.h winmsg.c window.h sched.c canvas.h || die
 	sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
 
-	# Fix manpage.
+	# Fix manpage
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
@@ -60,7 +53,7 @@ src_prepare() {
 		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
 		doc/screen.1 || die
 
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
 	fi
 
@@ -74,7 +67,7 @@ src_prepare() {
 src_configure() {
 	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
 
-	if [[ ${CHOST} == *-solaris* ]] ; then
+	if [[ ${CHOST} == *-solaris* ]]; then
 		# enable msg_header by upping the feature standard compatible
 		# with c99 mode
 		append-cppflags -D_XOPEN_SOURCE=600
@@ -89,6 +82,7 @@ src_configure() {
 		--with-pty-mode=0620
 		--with-pty-group=5
 		--enable-telnet
+		--enable-utmp
 		$(use_enable pam)
 	)
 	econf "${myeconfargs[@]}"
@@ -138,8 +132,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
+	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."