From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 22 Jan 2021 20:28:19 +0000
Subject: gentoo resync : 22.01.2021

---
 app-misc/screen/Manifest               |   4 +-
 app-misc/screen/screen-4.8.0-r1.ebuild | 158 +++++++++++++++++++++++++++++++++
 app-misc/screen/screen-4.8.0.ebuild    | 156 --------------------------------
 app-misc/screen/screen-9999.ebuild     |   4 +-
 4 files changed, 163 insertions(+), 159 deletions(-)
 create mode 100644 app-misc/screen/screen-4.8.0-r1.ebuild
 delete mode 100644 app-misc/screen/screen-4.8.0.ebuild

(limited to 'app-misc/screen')

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index e70c986229e4..fa2c11a2f58a 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -2,6 +2,6 @@ AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0.ebuild 4092 BLAKE2B b04c3690e0ac0ca99ed0415b9a787b49325babd2b1dfdd7e56837bfbe45471edd7ecf60b31a71813a9ba99360de6a34ddb568cf8f6888ef08179d26be0b3d701 SHA512 bd9d2deafffecd1d5ead6b267c6043a6f922386ba38f66d1f9ce7c1b84c528cab1cc88a05bfb3daad8ebaa79ba3e5c4f7e34a68cf77c417ad72ad2d7ff5dd0a2
-EBUILD screen-9999.ebuild 4198 BLAKE2B 8725fbe971f100408e3ab05d5170922ec4e3e0b552117393f69687e5d81154df43149775d76d1dea5e97bd773c599a86e43f63a73a82b61b1e3c2d345aa87cf3 SHA512 9e3dd8453f70671469eb471782ae77b205521507e2959c93157b0e8dffd56e87a34990e726d310aea946ba3a0f265846bbe05daa64762ff1530165fc93f3688a
+EBUILD screen-4.8.0-r1.ebuild 4115 BLAKE2B 5d9bff693395a3a104253585b30561dda21444540420a68d74ca7d9ca753d79fbb26f82164bf222a659545dc570189db0641f1437f329edc3066630fb0c69f95 SHA512 60d6fdf67117a025cedd504bc109cb519f96defeb7cdded86b5a473641d89969cbdcd939c51849249dd43e1e24ce07ecefdabf9f74f469bf1458d54defa6317f
+EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r1.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..30a4c5053768
--- /dev/null
+++ b/app-misc/screen/screen-4.8.0-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
+
+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 ~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
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( sys-libs/pam )"
+RDEPEND="${CDEPEND}
+	acct-group/utmp
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	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
+)
+
+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:' screen.h || 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
+
+	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
+}
+
+src_configure() {
+	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-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-rxvt_osc
+		--enable-telnet
+		--enable-colors256
+		$(use_enable pam)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		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
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT}/tmp/${PN}"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild
deleted file mode 100644
index 22ea9a336fbc..000000000000
--- a/app-misc/screen/screen-4.8.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
-
-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 ~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
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	acct-group/utmp
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	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
-)
-
-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:' screen.h || 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
-
-	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
-}
-
-src_configure() {
-	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-sys-screenrc="${EPREFIX}/etc/screenrc"
-		--with-pty-mode=0620
-		--with-pty-group=5
-		--enable-rxvt_osc
-		--enable-telnet
-		--enable-colors256
-		$(use_enable pam)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		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
-
-	pamd_mimic_system screen auth
-
-	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
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT}/tmp/${PN}"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 52f096401272..b61017df938f 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -129,7 +129,9 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}"/screenrc
 
-	pamd_mimic_system screen auth
+	if use pam; then
+		pamd_mimic_system screen auth
+	fi
 
 	dodoc "${DOCS[@]}"
 }
-- 
cgit v1.2.3