Run devpts check in pkg_pretend when using newer EAPIs #539928 by teika.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

8 files changed, 61 insertions, 27 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index b3364df86327..a1069c557220 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1052 2015/05/21 04:23:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1053 2015/05/27 13:55:42 vapier Exp $
+
+  27 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/eblits/pkg_pretend.eblit, files/eblits/pkg_preinst.eblit,
+  glibc-2.20-r1.ebuild, glibc-2.20-r2.ebuild, glibc-2.20.ebuild,
+  glibc-2.21.ebuild, glibc-9999.ebuild:
+  Run devpts check in pkg_pretend when using newer EAPIs #539928 by teika.
 
   21 May 2015; Matt Turner <mattst88@gentoo.org> glibc-2.20-r2.ebuild:
   alpha stable, bug 544034.
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 0fcb24a09e1a..47d23767f015 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.13 2014/08/10 03:35:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.14 2015/05/27 13:55:42 vapier Exp $
 
 # Simple test to make sure our new glibc isnt completely broken.
 # Make sure we don't test with statically built binaries since
@@ -53,17 +53,8 @@ eblit-glibc-pkg_preinst() {
 	[[ -d ${D}/$(get_libdir) ]] || return 0
 	glibc_sanity_check
 
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
-	if in_iuse suid && ! use suid ; then
-		if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
-			eerror "In order to use glibc with USE=-suid, you must make sure that"
-			eerror "you have devpts mounted at /dev/pts with the gid=5 option."
-			eerror "Openrc should do this for you, so you should check /etc/fstab"
-			eerror "and make sure you do not have any invalid settings there."
-			# Do not die on older kernels as devpts did not export these settings #489520.
-			if version_is_at_least 2.6.25 $(uname -r) ; then
-				die "mount & fix your /dev/pts settings"
-			fi
-		fi
+	# For newer EAPIs, this was run in pkg_pretend.
+	if [[ ${EAPI:-0} == [0123] ]] ; then
+		check_devpts
 	fi
 }
diff --git a/sys-libs/glibc/files/eblits/pkg_pretend.eblit b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
new file mode 100644
index 000000000000..963a9ab13efa
--- /dev/null
+++ b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_pretend.eblit,v 1.1 2015/05/27 13:55:42 vapier Exp $
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# Older versions always installed setuid, so no need to check.
+	in_iuse suid || return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		# Do not die on older kernels as devpts did not export these settings #489520.
+		if version_is_at_least 2.6.25 $(uname -r) ; then
+			die "mount & fix your /dev/pts settings"
+		fi
+	fi
+}
+
+eblit-glibc-pkg_pretend() {
+	# For older EAPIs, this is run in pkg_preinst.
+	if [[ ${EAPI:-0} != [0123] ]] ; then
+		check_devpts
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.20-r1.ebuild b/sys-libs/glibc/glibc-2.20-r1.ebuild
index 051a2062fdaa..f2ee775df6d7 100644
--- a/sys-libs/glibc/glibc-2.20-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r1.ebuild,v 1.2 2014/12/31 08:22:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r1.ebuild,v 1.3 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 7ef195447294..408ee90ebefb 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r2.ebuild,v 1.10 2015/05/21 04:23:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r2.ebuild,v 1.11 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.20.ebuild b/sys-libs/glibc/glibc-2.20.ebuild
index ad923e59e335..74b98738a126 100644
--- a/sys-libs/glibc/glibc-2.20.ebuild
+++ b/sys-libs/glibc/glibc-2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20.ebuild,v 1.6 2014/11/11 02:08:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20.ebuild,v 1.7 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -144,7 +144,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.21.ebuild b/sys-libs/glibc/glibc-2.21.ebuild
index d21bad93b35d..0980691694c8 100644
--- a/sys-libs/glibc/glibc-2.21.ebuild
+++ b/sys-libs/glibc/glibc-2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21.ebuild,v 1.3 2015/04/27 03:44:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21.ebuild,v 1.4 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a99491fd2366..e08c5778c0d5 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.28 2015/01/05 13:39:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.29 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"