Fix Stage1 building wrt #232823.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 246 insertions, 2 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 41bfae63aa32..24bd2b2df745 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.482 2010/10/08 01:43:23 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.483 2010/11/04 00:33:57 ssuominen Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-2.0.1-r1 (04 Nov 2010)
+
+  04 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +baselayout-2.0.1-r1.ebuild, +files/baselayout-2.0.1-proc_touch.patch:
+  Fix Stage1 building wrt #232823.
+
   08 Oct 2010; Mart Raudsepp <leio@gentoo.org> baselayout-1.11.15-r3.ebuild:
   Drop to ~mips
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index d61673691762..7d2e76299e98 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -2,6 +2,7 @@ AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9
 AUX baselayout-1.11.15-coldplug.patch 2449 RMD160 6a8838bbd2b724d305ff14ae66a935773931e51a SHA1 6df3abaf389b40d7b3371849e73d6b0507d63cf6 SHA256 626428986dd21c95b16d464e845ffa79dd535aaf089b91423e704e7d64562d26
 AUX baselayout-1.11.15-halt-sort.patch 758 RMD160 282a645738a22098242b56d3f1d39321865f6b49 SHA1 6282f2bc1c7d04e383280fb5367c95e42ac06158 SHA256 496dd355956c960be8a4db1021c3ee76a9250346e0e83f2470974de3859a753e
 AUX baselayout-1.12.14-iproute.patch 633 RMD160 50419eb79bfac3e44bdfa1c0558e267cf5772578 SHA1 0b4d58f7736024b2dbbbe1e79fdbf4fb254db478 SHA256 d30480e75024953ac64a51cf7a3d54f4f975470219da2cec9ad0832b5ff6eff9
+AUX baselayout-2.0.1-proc_touch.patch 528 RMD160 857f43c38e61cc719b711c99c46d9cee5c6042b0 SHA1 bd3ed9b9805b284f62ee7c66814195ace475569d SHA256 5c8108347da5881ba982a4c8831b846393d6c6928d6497f021633e45d6f3ab39
 DIST baselayout-1.12.13.tar.bz2 269861 RMD160 3164982024951a54f498f80e6a8fd8c65effd664 SHA1 13cbb733ea3e21e8910340b821faaa393db3ae7d SHA256 61a308b602becf49cf05a9e2ef6d03f4ebb159b83b0562326c4b670577d5d39b
 DIST baselayout-1.12.14.tar.bz2 270679 RMD160 403731fb5d7acb6da26d660ae79661506114a387 SHA1 c425706243a38b321d6f786923a973f15ebe7f0e SHA256 81890e1a17666cc1ae490e4bb963ddc8b9aba8891ba3175a1869444200267ebc
 DIST baselayout-2.0.1.tar.bz2 23232 RMD160 43cc68d2ea0847578906aa64e475152ea6da0273 SHA1 3fab155e800ef7898b6c64e81919b3c755362fa9 SHA256 33c3c2a2ccfc7126287e0adf76a8d318249328119fb8d0f1bc122eebfc2a380b
@@ -10,6 +11,7 @@ EBUILD baselayout-1.11.15-r3.ebuild 18809 RMD160 54526c38d75fd7ee7bbd89e9d099c4e
 EBUILD baselayout-1.12.13.ebuild 19189 RMD160 6b0354c12fcca4dadc8a63019d9b29b9318758a1 SHA1 7839a44eea1c2123c7e11adf2e8283aba5c31510 SHA256 15fc7f46eed8ce14d7d2f1d5e4e0fd15b419d94dda9dab9c4f65e61cf686585a
 EBUILD baselayout-1.12.14-r1.ebuild 19253 RMD160 4ae2995f908bbafcb80d181abc9dd07cb125db2e SHA1 bbb39920b7c19ccc9584bd16a0c5b7afabac671f SHA256 90e0109d9a51d7891c8d1fd47a290c6297a70b83a8465860acfcb510ad5eb665
 EBUILD baselayout-1.12.14.ebuild 19200 RMD160 3a1f07bf7393bd5938146a9855c82602796e8a0c SHA1 5331b832dd7203e1adbad6e9ea3d5a96c1f46558 SHA256 a855305c954b92d128e18ceba984a3138b0267460c86cc69799f0431a805814c
+EBUILD baselayout-2.0.1-r1.ebuild 7454 RMD160 bd613cc9cb856596c1316d9946ded08c08b3d225 SHA1 69242e6cd1451f742bb8268812693406d37394cc SHA256 5e57264feb3f9f4dfb3626bdd39d2aba6001e527780fb108da227568256a397b
 EBUILD baselayout-2.0.1.ebuild 7347 RMD160 ee300eefd58745f8ed79d5cfbe3eb7158dc9797c SHA1 bae1622887b53613942891395f645ec88b464c01 SHA256 c4dff38f29f41ea727a008ffea0d6c77ff84923aafc8f65efae6c61b502cbaff
-MISC ChangeLog 103652 RMD160 15c9c9ffea417e7a4002e200a60246adf141e745 SHA1 53413616674b3ee2e7ea0a28912f57df2d6adc4f SHA256 408ab0d969701fd514cbf3dd3857c874f81d9bd2a226abbccde51f18d771427b
+MISC ChangeLog 103856 RMD160 79b49282211d4dd68d2c12ede1ced7e2115c631e SHA1 4982f58fe840531caf51c7a67b5a592bdc1b8601 SHA256 59aad1ed66dc67e188051097832133ddcc7f247068d9aba7459a3cd616bbd68f
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..d81cd02a1de7
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.1-r1.ebuild,v 1.1 2010/11/04 00:33:57 ssuominen Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="build"
+
+PDEPEND="sys-apps/openrc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-proc_touch.patch #232823
+}
+
+pkg_preinst() {
+	# Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
+	# the baselayout-1.x ebuild copies all the real configs from the user's
+	# /etc/conf.d into ${D}, it makes them all appear to be the default
+	# versions. In order to protect them from being unmerged after this
+	# upgrade, modify their timestamps.
+	touch "${ROOT}"/etc/conf.d/* 2>/dev/null
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	if use build ; then
+		local libdirs="$(get_all_libdirs)" dir=
+		# Create our multilib dirs - the Makefile has no knowledge of this
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			mkdir -p "${ROOT}${dir}"
+			touch "${ROOT}${dir}"/.keep
+			mkdir -p "${ROOT}usr/${dir}"
+			touch "${ROOT}usr/${dir}"/.keep
+			mkdir -p "${ROOT}usr/local/${dir}"
+			touch "${ROOT}usr/local/${dir}"/.keep
+		done
+
+		# Create symlinks for /lib, /usr/lib, and /usr/local/lib and
+		# merge contents of duplicate directories if necessary.
+		# Only do this when $ROOT != / since it should only be necessary
+		# when merging to an empty $ROOT, and it's not very safe to perform
+		# this operation when $ROOT = /.
+		if [ "${SYMLINK_LIB}" = yes ] && [ "$ROOT" != / ] ; then
+			local prefix libabi=$(get_abi_LIBDIR $DEFAULT_ABI)
+			for prefix in "$ROOT"{,usr/,usr/local/} ; do
+
+				[ ! -d "${prefix}lib" ] && rm -f "${prefix}lib" && \
+					mkdir -p "${prefix}lib"
+
+				[ ! -d "$prefix$libabi" ] && ln -sf "${prefix}lib"
+
+				[ -h "$prefix$libabi" ] && [ -d "${prefix}lib" ] && \
+					[ "$prefix$libabi" -ef "${prefix}lib" ] && continue
+
+				local destdir=$prefix$libabi/ srcdir=${prefix}lib/
+
+				[ -d "$destdir" ] || die "unable to create '$destdir'"
+				[ -d "$srcdir" ] || die "unable to create $srcdir"
+
+				mv -f "$srcdir".keep "$destdir".keep 2>/dev/null
+				if ! rmdir "$srcdir" 2>/dev/null ; then
+					ewarn "merging contents of '$srcdir' into '$destdir':"
+
+					# Move directories if the dest doesn't exist.
+					find "$srcdir" -type d -print0 | \
+					while read -d $'\0' src ; do
+
+						# If a parent directory of $src has already
+						# been merged then it will no longer exist.
+						[ -d "$src" ] || continue
+
+						dest=$destdir${src#${srcdir}}
+						if [ ! -d "$dest" ] ; then
+							if [ -e "$dest" ] ; then
+								ewarn "  not overwriting file '$dest'" \
+									"with directory '$src'"
+								continue
+							fi
+							mv -f "$src" "$dest" && \
+								ewarn "  /${src#${ROOT}} merged" || \
+								ewarn "  /${src#${ROOT}} not merged"
+						fi
+					done
+
+					# Move non-directories.
+					find "$srcdir" ! -type d -print0 | \
+					while read -d $'\0' src ; do
+						dest=$destdir${src#${srcdir}}
+						if [ -e "$dest" ] ; then
+							if [ -d "$dest" ] ; then
+								ewarn "  not overwriting directory '$dest'" \
+									"with file '$src'"
+							else
+								if [ -f "$src" -a ! -s "$src" ] && \
+									[ -f "$dest" -a ! -s "$dest" ] ; then
+									# Ignore empty files such as '.keep'.
+									true
+								else
+									ewarn "  not overwriting file '$dest'" \
+										"with file '$src'"
+								fi
+							fi
+							continue
+						fi
+
+						mv -f "$src" "$dest" && \
+							ewarn "  /${src#${ROOT}} merged" || \
+							ewarn "  /${src#${ROOT}} not merged"
+					done
+				fi
+
+				rm -rf "${prefix}lib" || \
+					die "unable to remove '${prefix}lib'"
+
+				ln -s "$libabi" "${prefix}lib" || \
+					die "unable to create '${prefix}lib' symlink"
+			done
+		fi
+
+		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+	fi
+	rm -f "${D}"/usr/share/${PN}/Makefile
+}
+
+src_install() {
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+	emake \
+		OS=$(use kernel_FreeBSD && echo BSD || echo Linux) \
+		LIB=${libdir} \
+		DESTDIR="${D}" \
+		install || die
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile || die
+
+	# Should this belong in another ebuild? Like say binutils?
+	# List all the multilib libdirs in /etc/env/04multilib (only if they're
+	# actually different from the normal
+	if has_multilib_profile || [ $(get_libdir) != "lib" -o -n "${CONF_MULTILIBDIR}" ]; then
+		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		done
+
+		# Special-case uglyness... For people updating from lib32 -> lib amd64
+		# profiles, keep lib32 in the search path while it's around
+		if has_multilib_profile && [ -d "${ROOT}"lib32 -o -d "${ROOT}"lib32 ] && ! hasq lib32 ${libdirs}; then
+			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+		fi
+		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
+		doenvd "${T}"/04multilib
+	fi
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${ROOT}etc/${x}" ] && continue
+		[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
+	done
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+	local release="${PV}"
+	[ "${PR}" != r0 ] && release="${release}-${PR}"
+	echo "Gentoo Base System release ${release}" > "${ROOT}"/etc/gentoo-release
+
+	# whine about users that lack passwords #193541
+	if [[ -e ${ROOT}/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e ${ROOT}/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+}
diff --git a/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch b/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch
new file mode 100644
index 000000000000..7b7df7808388
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-2.0.1-proc_touch.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/232823
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/baselayout/trunk/Makefile?r1=3171&r2=3172
+
+--- Makefile
++++ Makefile
+@@ -49,8 +49,9 @@
+ layout:
+ 	# Create base filesytem layout
+ 	for x in $(KEEP_DIRS) ; do \
++		test -e $(DESTDIR)$$x/.keep && continue ; \
+ 		$(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \
+-		touch $(DESTDIR)$$x/.keep || exit $$? ; \
++		touch $(DESTDIR)$$x/.keep || echo "ignoring touch failure; mounted fs?" ; \
+ 	done
+ 	# Special dirs
+ 	install -m 0700 -d $(DESTDIR)/root || exit $$?