remove old unstable versions

Package-Manager: portage-2.2.0_alpha188/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 11 insertions, 460 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index a5a5c1a64506..f2435e31dc1f 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.542 2013/05/20 17:56:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.543 2013/07/19 01:58:53 williamh Exp $
+
+  19 Jul 2013; William Hubbs <williamh@gentoo.org> -baselayout-2.0.3.ebuild,
+  -baselayout-2.1.ebuild:
+  remove old unstable versions
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> baselayout-2.2.ebuild:
   Stable for s390, wrt bug #455872
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index b264e1db6741..44bfb2209968 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,30 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-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 8163 SHA256 545773c126bde35ae593c3704b1d4f1ccc5020ffd032d505e4e1d33e6163bfd5 SHA512 5c73a5b2cbf34c3e15bedd454eeb236861d1683c01c017eecc37615bc5fbbceac12974fbe3d8cc41ce5a6a3dceb0d3e7fbcca606e34f02ad22b1c443ab1d6ecd WHIRLPOOL 7e1525a1743b5eea804aeb456be07bbc2b2719a119f77bbfa4a89b8ca9794d99ba9d5ec73a394c3bf15b22b1c55f98468880533cea312ff3195fc33f9698eac0
-EBUILD baselayout-2.1.ebuild 7873 SHA256 919fcf660f37ea4b8b32d9688926ad618ea92fb13743f630dd2352bd215c714d SHA512 71a17a7e75f021b871c72271b4090c954075b3b3d115b987820bfc05d8a5f84b8975902bfe7bfeaba46fb03f9eba8936af96d5e407624f1cd927e4144388c62f WHIRLPOOL 559641ddc94b3287bd520530252247de18c950de555ccd7d69a4e4bf8e1e4be47bd2fb448fedacd4224f163382f438c4292d71b89ab0d2cec98c3b82a9c35704
 EBUILD baselayout-2.2.ebuild 8220 SHA256 02b743c5c61e75e95e900396b3da2b2bb663f5ce5d8446c05e2462e16e493a70 SHA512 797c57e8917183d9d1edd3acabb6514dbc0aca1544638d00387669a937964c0846c73a09a0cf007eb855de47e99141c26356fda182d6eaaeae5d1995b4a29c4e WHIRLPOOL a354606a11c84cad5bfc68e5bca36c083a597ec1b481fea699ff15eb17cbeb308b45a6e19cb2ee21fd6a84efc9a849428fb8c6cb9f8e858a84c0c12398734614
-MISC ChangeLog 9317 SHA256 dc2a2db945605151aad1dc26f8aa5c2704793bd3575e7195e022a28a347a3c4e SHA512 77520caa0fa9acffa4e9d989e7e1ed660e6a6d0432d07766e7639a57e717c0e2269eec46fb621afb0c3bf1800b851280e2593abb691e0fc7fd05b72514470d40 WHIRLPOOL 8c4c34c61895a430636358487d022c530b32ee1b3d8d681e96daa66f30254117135e239069f7761e53a2a6c185052bcdd1699fae01df6f6d6e305a0d8a288969
+MISC ChangeLog 9457 SHA256 f745288ef6dd0e5f1a5877f19f6a2f368b2ce4c13f8bcabc3e9b08bbd905989d SHA512 75a5c7d5de125473620731b71dc803ad28b4046896065925937e94b92fcffda7ec3b8d71525f79a4cd9b61bef0e0dc2832e612af5305223187b40c4aeb4302d9 WHIRLPOOL aa24c19ffcf6c91d484c879e9ac30439be7559f0d280134ea30d71bba30460061d03651e5e0be51ae64b024da8c73de4251e89ee03fa27df37e1643b0992319b
 MISC ChangeLog-2008 101952 SHA256 cb360ccdd6458e3faa54214ea6370ade92265bafa1b1aa7789165b5dfee3e5c8 SHA512 d888de07f955094603497e06a083ffe33d3bfeeed7aede59bca5cd60a6c1d5334d691a8d0a7ae7534af6e82fcd8dbf522f9ac3024a468f5035a9245024cc726f WHIRLPOOL 97ee6ca2c4b9a3fc0a919cd6f286165b1eec32e32acb7f2c81e04464fd7a34cc5847e7087795479a5475bc25eaea89ae28b56bcfd11f3d51c6153d83c26f9bdb
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRmmMeAAoJELp701BxlEWfbMwP/A0nkAxTqwNgpoXM9fTxZE9u
-Onp1VosvIUjdutgl3QeR5B7WQuXzob1GgLDXkMv1oV0p+GhWyDQnq7TgOwzr/mKc
-2uEl0IlCKmADbGZfb/Abf17Zr9lBdKGEMYjTsy5H1UxKz0J7VudNol6+XtyMA0jj
-mp02cS3Jll4eK7Dcz73WPq0HYUOl7+5HvKlQOJiKE4+K8EwMuqPxpO5J60uolK/Z
-n9qBIYWP47+551R7H0ZPVEqQHnJpiwvA/2vXunKNb3R5MoBRJE9AG4Slb0HTIjlK
-yTjGjNKhHWZGvouVeEMIsuVTQO2mj3iRHHxEBMpBAoTQuVVwRDUlrDWN0tjNWkf0
-1oJ2s3KVXoxLj7aFDbDhMczFmpeLmUEavmAs/4XhqsD6XOx44H8C3UCPP8s7xUF4
-4iCf/4Pj1DxarH6g67YviZWCSSyQY7WNOb7j6OhpjoSoUdxJOSB+vft9gnPsCJhS
-jwGbDVirgMB5Mw8YaFKznzsni03C0IHHPRSaJ2Izf3DALdH5QOY5Ttv3ngyCJCp9
-vh0JnRvzXaKjxUhsr8AEMYnOWT+f5jPkLEyVly3Q1WZLxQzEvhaYAko9vMZ1h9uw
-vlRmbXl6q3aINz2kLgCvLUcWEdJToOPIwz457TO5CIj32KdH8TsnxVnXI0qOLJ3S
-o18z2vBRfVMUetgWYcZi
-=rxTI
+iEYEAREIAAYFAlHonV8ACgkQblQW9DDEZTiWdwCgqzjW/x6IxUgekNUBpn6Qet9F
+aMcAn0Z5idOHCk04Nfw6fai6LMxdZ5w2
+=RI0G
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-2.0.3.ebuild b/sys-apps/baselayout/baselayout-2.0.3.ebuild
deleted file mode 100644
index 9bbb66114ab4..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.3.ebuild,v 1.10 2011/07/24 21:21:31 hwoarang 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 ~sparc-fbsd ~x86-fbsd"
-IUSE="build"
-
-PDEPEND="sys-apps/openrc"
-
-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.
-	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.svn
-
-	# 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 ] && ! has 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
-
-	# 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
-
-	# 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/baselayout-2.1.ebuild b/sys-apps/baselayout/baselayout-2.1.ebuild
deleted file mode 100644
index ddbd97f6ac9b..000000000000
--- a/sys-apps/baselayout/baselayout-2.1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# 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.1.ebuild,v 1.7 2012/04/26 14:30:49 aballier 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"
-
-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
-}