Changed to use pam.eclass and pamd_mimic_system.

(Portage version: 2.0.51.22-r1)

4 files changed, 20 insertions, 22 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index bcfcd35a9a1b..9727ee32d854 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.84 2005/05/14 22:08:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.85 2005/05/20 13:18:27 swegener Exp $
+
+  20 May 2005; Sven Wegener <swegener@gentoo.org> -files/screen.pam,
+  screen-4.0.2-r1.ebuild, screen-4.0.2-r3.ebuild:
+  Changed to use pam.eclass and pamd_mimic_system.
 
 *screen-4.0.2-r3 (14 May 2005)
 
diff --git a/app-misc/screen/files/screen.pam b/app-misc/screen/files/screen.pam
deleted file mode 100644
index 2b20dea9586c..000000000000
--- a/app-misc/screen/files/screen.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# This is the PAM configuration file for screen(1)
-#
-auth    include		system-auth
diff --git a/app-misc/screen/screen-4.0.2-r1.ebuild b/app-misc/screen/screen-4.0.2-r1.ebuild
index a7f2f4b7089c..48a66c7befad 100644
--- a/app-misc/screen/screen-4.0.2-r1.ebuild
+++ b/app-misc/screen/screen-4.0.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r1.ebuild,v 1.2 2005/01/01 15:22:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r1.ebuild,v 1.3 2005/05/20 13:18:27 swegener Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic pam
 
 DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes"
 HOMEPAGE="http://www.gnu.org/software/screen/"
@@ -20,21 +20,22 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die
+	unpack ${A}
+	cd "${S}"
 
 	# Bug 34599: integer overflow in 4.0.1  
 	# (Nov 29 2003 -solar)
-	epatch ${FILESDIR}/screen-4.0.1-int-overflow-fix.patch
+	epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
 
 	# Bug 31070: configure problem which affects alpha  
 	# (13 Jan 2004 agriffis)
-	epatch ${FILESDIR}/screen-4.0.1-vsprintf.patch
+	epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
 
 	# uclibc doesnt have sys/stropts.h
-	use uclibc && epatch ${FILESDIR}/${PV}-no-pty.patch
+	use uclibc && epatch "${FILESDIR}"/${PV}-no-pty.patch
 
 	# Don't use utempter even if it is found on the system
-	epatch ${FILESDIR}/${PV}-no-utempter.patch
+	epatch "${FILESDIR}"/${PV}-no-utempter.patch
 
 	# Fix manpage.
 	sed -i \
@@ -51,7 +52,7 @@ src_unpack() {
 }
 
 src_compile() {
-	addpredict "`tty`"
+	addpredict "$(tty)"
 	addpredict "${SSH_TTY}"
 
 	# check config.h for other settings such as the
@@ -88,12 +89,9 @@ src_install() {
 	insinto /usr/share/screen/utf8encodings
 	doins utf8encodings/?? || die "doins failed"
 	insinto /etc
-	doins ${FILESDIR}/screenrc || die "doins failed"
+	doins "${FILESDIR}"/screenrc || die "doins failed"
 
-	use pam && {
-		insinto /etc/pam.d
-		newins ${FILESDIR}/screen.pam.system-auth screen || die "newins failed"
-	}
+	newpamd "${FILESDIR}"/screen.pam.system-auth screen || die "newpamd failed"
 
 	dodoc \
 		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
@@ -105,7 +103,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	chmod 0775 ${ROOT}/var/run/screen
+	chmod 0775 "${ROOT}"/var/run/screen
 
 	einfo "Some dangerous key bindings have been removed or changed to more safe values."
 	einfo "For more info, please check /etc/screenrc"
diff --git a/app-misc/screen/screen-4.0.2-r3.ebuild b/app-misc/screen/screen-4.0.2-r3.ebuild
index 2514aa841981..98cf7437537c 100644
--- a/app-misc/screen/screen-4.0.2-r3.ebuild
+++ b/app-misc/screen/screen-4.0.2-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r3.ebuild,v 1.1 2005/05/14 22:08:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r3.ebuild,v 1.2 2005/05/20 13:18:27 swegener Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs pam
 
 DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes"
 HOMEPAGE="http://www.gnu.org/software/screen/"
@@ -97,7 +97,7 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}"/screenrc || die "doins failed"
 
-	newpamd "${FILESDIR}"/screen.pam screen || die "newpamd failed"
+	pamd_mimic_system screen auth || die "pamd_mimic_system failed"
 
 	dodoc \
 		README ChangeLog INSTALL TODO NEWS* patchlevel.h \