bump baselayout

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

2 files changed, 215 insertions, 217 deletions

diff --git a/sys-apps/baselayout/baselayout-2.0.3-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.3-r1.ebuild
deleted file mode 100644
index 846a2e83..00000000
--- a/sys-apps/baselayout/baselayout-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="~amd64 ~x86"
-IUSE="build +openrc"
-
-PDEPEND="openrc? ( sys-apps/openrc )
-   !openrc? ( sys-apps/systemd )"
-
-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 ] && ! 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
-
-	# 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.0-r1.ebuild b/sys-apps/baselayout/baselayout-2.1.0-r1.ebuild
new file mode 100644
index 00000000..ee0d6748
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.1.0-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="~amd64 ~x86"
+IUSE="build +openrc"
+
+PDEPEND="openrc? ( sys-apps/openrc )
+   !openrc? ( sys-apps/systemd )"
+
+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...
+
+	# 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" ...
+				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
+			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
+
+	# 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
+}