Version bump #419465 by Yuta SATOH.

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

3 files changed, 265 insertions, 14 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 5992c386fff8..85d94802d6f1 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.527 2012/06/17 18:15:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.528 2012/08/20 20:45:03 vapier Exp $
+
+*baselayout-2.2 (20 Aug 2012)
+
+  20 Aug 2012; Mike Frysinger <vapier@gentoo.org> +baselayout-2.2.ebuild:
+  Version bump #419465 by Yuta SATOH.
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 8892cdea511e..a769160981aa 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST baselayout-2.0.3.tar.bz2 39969 RMD160 ca4ae235382780cd386c89f0147fbe17bb599414 SHA1 c5dbcc2d131254b2bb14b782101e2318d1dfcd2d SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd
-DIST baselayout-2.1.tar.bz2 40398 RMD160 bba874c5d3290848236703125c130107c1244f55 SHA1 84783a773ec050700b3b0ce4c7645ae878f7f7fb SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956
-EBUILD baselayout-2.0.3.ebuild 7366 RMD160 579ac15844268e72cd9e1f593501e9a5806f4043 SHA1 3dcb7064e613d063fbe2428f7e3f57d92a2d9219 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4
-EBUILD baselayout-2.1-r1.ebuild 8118 RMD160 aeba229f239ffd39e738c0137ffaddef50d6abf8 SHA1 2420aa9be40a7f5dadb298f4c974b931071e1e1d SHA256 8e07f70fb4fed4fc9b7e8d345cd935e91eb586ae4324d99bac3633d99211eacc
-EBUILD baselayout-2.1.ebuild 7873 RMD160 89ab4ce55ff4abc2c65f210434beee289ff779db SHA1 cb98104e006861fcccb48ee92aad374c865b9f6d SHA256 919fcf660f37ea4b8b32d9688926ad618ea92fb13743f630dd2352bd215c714d
-MISC ChangeLog 7763 RMD160 86682a6e1c78286678ae48a5fc23d606827a20b2 SHA1 6fc95b58d0cabb2d5fe876531a95e33a944ef685 SHA256 5055de5e2b8268c3a69bc994fb7d9c2efbb52ded5efaf060d63d0eb8c2b4f519
-MISC ChangeLog-2008 102096 RMD160 bb2cd7cbc78ed550bec5c6ca6684dda9ebde9749 SHA1 05f80c582256886de5d35eca4a274c8aaecc3df8 SHA256 ce58cd95dfef4fe9bb8b2c024532167683d0802f7f5fc4e153d12db6440791a4
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+DIST baselayout-2.0.3.tar.bz2 39969 SHA256 879308781d845f467eb2b45b9ff006aa799e943f45ddba518f43acae1ec84bdd SHA512 d95a6eaecb6fb92a3a91bcfeacaf4071261058ef6cd2165c63497f514989a41afde1c28ff0571e2945a844d97822e5e463ab4793aa2ff8d181168d491ef5b297 WHIRLPOOL 50101ce1cf729fc117846ec480e0714625383f6d8bed77dcbd01e38ae07410549a2b62a9e8c285624c7cbdf5dc2116c0f1bd5033dcd7defab1bdf1f842c99862
+DIST baselayout-2.1.tar.bz2 40398 SHA256 2ac6f2156513a2820a0eeeecc2cf7e7c0b5e0c750b324f1e21912d5f3cda4956 SHA512 3a7ab13eb0cb75bd96ceab652f6a2848edb93285eaec1993257531bc19a8c9705b82e9928929048df4ad6023bc13eb2f40b15cae63e6a94e316a772fdbae6313 WHIRLPOOL edddd31366baf3b90c7f9d15e4a0ec7b25dcd2820058bc83132ac45c2a48630003f9c7e983283752e6b3f7be4a6d545047461d4f04deb807d2b2a91fd278de35
+DIST baselayout-2.2.tar.bz2 40744 SHA256 11d4a223b06da545c3e59e07c9195570f334b5b1be05d995df0ebc8ea2203e98 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 WHIRLPOOL 60cc4f7f76c5a45c15303e526decffb3bad2b50ac659b1dd072d2ed4b0eb0b31929a1a733ddb03a31ee5882b889a4efb87206f63ffaa2b11e26d36afd0933a95
+EBUILD baselayout-2.0.3.ebuild 7366 SHA256 e72e760fbc2452212fee89e5f4c00437b11d7973b5c27933c58481e9a656f5a4 SHA512 f1608644605f1bf067d7c70b9e137d9cd247a9cbb8a12bd49d263ea9f6de15e649305807b54fcf93f4b7f3d61aa58a4aff9bdb3e4a3471cae21a8deac99a53ac WHIRLPOOL ca3e8e4ce7243906a5d73180f54a276b4759997f07e9b37b606b8c95f9d0a2e1ec7e0d24f79f438c3077bc35c2ca43b901658194b90d7009da36590493b2addd
+EBUILD baselayout-2.1-r1.ebuild 8118 SHA256 8e07f70fb4fed4fc9b7e8d345cd935e91eb586ae4324d99bac3633d99211eacc SHA512 ae1018661c27cc6efa636e255adf236c45841347b068efae69295494b171ab036bbebaadd7d6c97a33502f04c409d717f2c4f4eeed47b3f3001f7acd6dd45c19 WHIRLPOOL ca2c51c8e754c4768449860b037a1152cdf47391a1571247e0d42040d020b90a0db2faa8d6513ddc32259f8ad05ca59c37098a19f33dbdf5fb205e4d2ba8415c
+EBUILD baselayout-2.1.ebuild 7873 SHA256 919fcf660f37ea4b8b32d9688926ad618ea92fb13743f630dd2352bd215c714d SHA512 71a17a7e75f021b871c72271b4090c954075b3b3d115b987820bfc05d8a5f84b8975902bfe7bfeaba46fb03f9eba8936af96d5e407624f1cd927e4144388c62f WHIRLPOOL 559641ddc94b3287bd520530252247de18c950de555ccd7d69a4e4bf8e1e4be47bd2fb448fedacd4224f163382f438c4292d71b89ab0d2cec98c3b82a9c35704
+EBUILD baselayout-2.2.ebuild 8125 SHA256 aca8b27ff2125b4be5a89b9671765ce5bda4216348d888852f493a1fd3586bfb SHA512 ccf12ae90a8f8b3ba28d7c700ff2d9edc2be4a952e9533b05a104e7c785a2988970d8a7d76f20c298499e6faacb4bbc99c4b6d0530a89da7b6044ebaac0bc788 WHIRLPOOL e249dade141dcc7c6b80af7c2e2c852e278680ae99bbc55717976d2a24ecc6ddab252661b0f5accb70ea3005017f9966b1ec9855875ac6341fc1d85ae1158961
+MISC ChangeLog 7906 SHA256 cb5dc3e719ba9c354e25ceae272359a486aaa12e04e0d8e6f07e7fd8dfa8ae2e SHA512 0522f33dc93c2bee4daed3368b1fb8b42183de81318040e9b1f80b08985a334b95c75f14a87fb0c9afe0ad03b82357e4b4c46026bf5888d54a034d0e556a815d WHIRLPOOL d75b548a25c5056c7e139a2d473bc5f03ead9169c2b348d1baa482aedcd038803d4b7e9c73a78a8f05bece4029c8c19eaa67569732847fdf28233d2c1ae903bc
+MISC ChangeLog-2008 102096 SHA256 ce58cd95dfef4fe9bb8b2c024532167683d0802f7f5fc4e153d12db6440791a4 SHA512 74acd5a57af73da3694ba5c42fee9735f82ee727535abcd20ccc424bc70daf449d84d1b90015b5865c44b46620758944b500872081226dc1cb68c9c342400347 WHIRLPOOL d0efd81f8c0dfe9ce4626e2f1ed0e94051d4f6f823fbad7bc3507313e92d7cae139f7e5368d86c388c98c9242775d39a1bce32543708b9036b62f8ef9dee5360
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/eHq4ACgkQuQc30/atMkAHCQCfTI9D75Ew8sMSxgoNtdCMNdT+
-qFMAnRjDxdFU+mMs7dW+5560tdPBoGGI
-=Dgt6
+iQIcBAEBCAAGBQJQMqHXAAoJELEHsLL7fEFWd/YP/j9SJlDWQEAH22oPfE6QMsvy
+9pLj+QK1c8VBU8y2gbnTx7Eitz6xEjjpOV47ztcd4dP2JMdvNCdOnSZg0pkuB+S1
+D+UUml/wjqSAbO4hCXA67gz6tmtkJVEtDOvZDygHvn0k73RzbY1C2Ag5t999d1fu
+nzzlluHLcD0m3KhZHcbRY0b0tlFqTO6OzSFfS73jhpiC2ZfKhS4pIzXDr8/YksTe
+HlrBMlsZtdXso/dF5yxfHbeEq1R+Wj9EM+nxIkrjdNYQDROojGAUNmdumq6V7w1r
+BMmlkW26RHgUisO1nw/Bh2dJRP4vj/MxJabZPyQ53TqxqwIzauAEeTMw6pSDEDzx
+LVKALbpXCDaeNOQ4zHxsX3ys8iY21uj7nU325Ve9KUPNsP150RX9zopKPBkeUaT0
+pTELc84YLLxpt3JuK6S5haxzKNV5KO0K6yFOczkZeD3ImFra7agWiLIfJ57vku4S
+fUTkt1zJWGz58CkytCW7PCuB8jXQOT2iOQzR4v8JyR1UJWhlmfTmLyPiEX/jXLSU
+B3IpECqsIHhR96P5cGtFb+pTY161xJlWUW7EqYtK5j7/gmw0F82zEQmRBwca26s9
+uzZbmU9hLt7hzwyn6n0cfnxxy41TKCwcyXYfD6nohwS6m8I/UwmBPbRMY6Tbwyi/
+pkDPtDWQQTVccDu6beSq
+=MDUu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild
new file mode 100644
index 000000000000..633a4a76b3fd
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.1 2012/08/20 20:45:03 vapier 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 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build kernel_linux"
+
+PDEPEND="sys-apps/openrc"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_warn() {
+	local syms=$1 dirs=$2 def_libdir=$3
+
+	[ -z "${syms}${dirs}" ] && return
+
+	ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means"
+	if [ -z "${syms}" ] ; then
+		ewarn "you need to have these paths as symlinks to ${def_libdir}:"
+		ewarn "$1"
+	fi
+}
+multilib_layout() {
+	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		exp=( {,usr/,usr/local/}${libdir} )
+		for d in "${exp[@]/#/${ROOT}}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	local prefix
+	for prefix in "${ROOT}"{,usr/,usr/local/} ; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [ -d "${prefix}lib32" ] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+			fi
+		fi
+	done
+}
+
+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
+
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+
+	# 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.
+	multilib_layout
+	if use build ; then
+		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die
+	fi
+	rm -f "${D}"/usr/share/${PN}/Makefile
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${D}" \
+		install || die
+	dodoc ChangeLog.svn
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile || die
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
+
+	# 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
+
+	# Take care of the etc-update for the user
+	if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
+	fi
+
+	# 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
+
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
+	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# 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
+
+	# http://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${ROOT}"/run
+
+		if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
+			echo
+			ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+		fi
+	fi
+}