alpha4 fixes many bugs

Package-Manager: portage-2.1.3_rc7

4 files changed, 300 insertions, 5 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 27fcd5064a92..c99079a76409 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.421 2007/06/26 14:14:19 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.422 2007/07/12 08:40:51 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-2.0.0_alpha4 (12 Jul 2007)
+
+  12 Jul 2007; Roy Marples <uberlord@gentoo.org>
+  +baselayout-2.0.0_alpha4.ebuild:
+  alpha4 fixes many bugs
+
   26 Jun 2007; Roy Marples <uberlord@gentoo.org>
   baselayout-2.0.0_alpha3.ebuild, baselayout-2.0.0_alpha3-r1.ebuild:
   Punt /lib/rcscripts/console when upgrading from 1.13, #181634.
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 429334222ca9..5b302faddc6a 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -36,6 +36,7 @@ DIST baselayout-1.13.0_alpha12.tar.bz2 230982 RMD160 6401629eeb92b13eb2bfbdc7f26
 DIST baselayout-2.0.0_alpha1.tar.bz2 128006 RMD160 71da0cdbc4c870736caba7b3c7b7afe5b413eb54 SHA1 d975c51dfb845926fd450501a15a0c7938bb0d11 SHA256 bb740d967e136e35958a5e64bca777ef16b3f29194a477fc2368aa8b8fab2193
 DIST baselayout-2.0.0_alpha2.tar.bz2 132406 RMD160 259b52abf8d706338ba99fded89c503bfeee807b SHA1 13f42355ce659582e6f23a691f6cf26188987ea0 SHA256 7e0b9df754bf55fffa25a112d328a3a37d43425daf94ee48ce80cab34a3df98c
 DIST baselayout-2.0.0_alpha3.tar.bz2 133097 RMD160 baff1fc62090059a62634a03f03d775bd7ad4115 SHA1 c2eeaace6efbfa1a2dc61fc33d0385575ee3ef81 SHA256 bf59e5c5241ca00e9af5147043d5d4666614cae4cec894c73f4912109dd276ea
+DIST baselayout-2.0.0_alpha4.tar.bz2 135316 RMD160 9404971a51dcc83f8f7da153908e0cc414b6e9eb SHA1 af5db75479dc8fdfca07b60342d78ecdea80bc34 SHA256 eb54db160380f65d2986bc80165c45859eee4f58bbe694fd093a7c5fdd91359b
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.15-r3.ebuild 18811 RMD160 53374dd4f21d0cec96852c5a346a5f791ad9e3a8 SHA1 722ec91ba2dbe8b80d5c1194d779e1d3450dc7d9 SHA256 427b2761578b65293daa82a81d8a4163c8ab11b540df2cd5f98f397f1b864b49
 MD5 bdc7d2ba0408e6f80f62464f3c87d32a baselayout-1.11.15-r3.ebuild 18811
@@ -77,10 +78,14 @@ EBUILD baselayout-2.0.0_alpha3.ebuild 9634 RMD160 1edd375d655e6346a72c51be2d477d
 MD5 b30713fafd5da676b4688c7985de4356 baselayout-2.0.0_alpha3.ebuild 9634
 RMD160 1edd375d655e6346a72c51be2d477dc9a6ae401f baselayout-2.0.0_alpha3.ebuild 9634
 SHA256 b4bd29238f7432c6a1874ed87b2e8a031dd6a609df13b57467130581f11083d7 baselayout-2.0.0_alpha3.ebuild 9634
-MISC ChangeLog 94299 RMD160 91d5fdb6b601d6b353fe3c22903c46261096f6b6 SHA1 46ee6627567e59d4948b4eff15c7f6d6906e97c9 SHA256 666d1de034c8655dc06bebdd20744fb024bcf4f37d8502f2dc9f358ad01f9831
-MD5 a608830ac164688336cb30a702a68141 ChangeLog 94299
-RMD160 91d5fdb6b601d6b353fe3c22903c46261096f6b6 ChangeLog 94299
-SHA256 666d1de034c8655dc06bebdd20744fb024bcf4f37d8502f2dc9f358ad01f9831 ChangeLog 94299
+EBUILD baselayout-2.0.0_alpha4.ebuild 9634 RMD160 f6f295ee7924184f7917dfea39d32dbfe17d400f SHA1 95630043b80b139a81f86b498ed362a8b18167dd SHA256 2be58c10a90a9916bb1aa4080ff36851c6f60aa57d9b3a9d4f5d4d686e7a23a3
+MD5 af0066ef7238a39ccfc878d10696a443 baselayout-2.0.0_alpha4.ebuild 9634
+RMD160 f6f295ee7924184f7917dfea39d32dbfe17d400f baselayout-2.0.0_alpha4.ebuild 9634
+SHA256 2be58c10a90a9916bb1aa4080ff36851c6f60aa57d9b3a9d4f5d4d686e7a23a3 baselayout-2.0.0_alpha4.ebuild 9634
+MISC ChangeLog 94449 RMD160 e7cc5c1267a61df8320fbac4dbededcc65639165 SHA1 70a6f1e5c8c43a9b397e1f409e7c45ef0d09437a SHA256 afc9ae38120659b144f2bafbb7f43d57f4b68a95aef0069e2f69399b4f56371a
+MD5 1fdaa70b1ad2c4ade34289f6177ebaf7 ChangeLog 94449
+RMD160 e7cc5c1267a61df8320fbac4dbededcc65639165 ChangeLog 94449
+SHA256 afc9ae38120659b144f2bafbb7f43d57f4b68a95aef0069e2f69399b4f56371a ChangeLog 94449
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -115,3 +120,6 @@ SHA256 3e13fd51116b15fef7f9833c65cab5a73b3418f97fc5b28b8f1cfc48ffce3b6a files/di
 MD5 842f7816803adb7caf22b4614051a996 files/digest-baselayout-2.0.0_alpha3-r1 274
 RMD160 8761a73190b7d872b9eb12299d0140dd612ff017 files/digest-baselayout-2.0.0_alpha3-r1 274
 SHA256 3e13fd51116b15fef7f9833c65cab5a73b3418f97fc5b28b8f1cfc48ffce3b6a files/digest-baselayout-2.0.0_alpha3-r1 274
+MD5 8d208679a6932a9800e5f02a6cfff101 files/digest-baselayout-2.0.0_alpha4 274
+RMD160 0eb4c4400e8441f25c1d45df91649b83b41d9323 files/digest-baselayout-2.0.0_alpha4 274
+SHA256 bea07cd22ff04224be86785c762617e491ea569bb6fca339a0aa7311ea20ec15 files/digest-baselayout-2.0.0_alpha4 274
diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild
new file mode 100644
index 000000000000..38578ca2d4ea
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild,v 1.1 2007/07/12 08:40:51 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/baselayout/${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="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+		!build? (
+			!bootstrap? (
+				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
+				kernel_FreeBSD? ( sys-process/fuser-bsd )
+			)
+		)
+		pam? ( virtual/pam )
+		!<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+PDEPEND="virtual/init
+	!build? ( !bootstrap? (
+		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
+	) )"
+
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+
+	# SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
+	# see Gentoo bug #104067.
+	if use sparc ; then \
+		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+	fi
+}
+
+make_opts() {
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+	local opts="${opts} LIB=${libdir}"
+
+	if use kernel_linux ; then
+		opts="${opts} OS=Linux"
+	else
+		opts="${opts} OS=BSD"
+	fi
+	use pam && opts="${opts} HAVE_PAM=1"
+
+	echo "${opts}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; then
+		sed -e 's/\<domain_/dns_domain_/g' \
+			-e 's/\<mac_domain_/mac_dns_domain_/g' \
+			-e 's/\<nameservers_/dns_servers_/g' \
+			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
+			-e 's/\<searchdomains_/dns_search_domains_/g' \
+			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
+			"${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1"
+	fi
+}
+
+pkg_preinst() {
+	# Move our makefiles to a temporay location
+	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
+
+	# 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 || use bootstrap ; 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
+
+		# Ugly compatibility with stupid ebuilds and old profiles symlinks
+		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
+			ln -s "${lib}" "${ROOT}lib"
+			ln -s "${lib}" "${ROOT}usr/lib"
+			ln -s "${lib}" "${ROOT}usr/local/lib"
+		fi
+
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+	fi
+
+	# Change some vars introduced in baselayout-1.11.0 before we go stable
+	# The new names make more sense and allow nis_domain
+	# for use in baselayout-1.12.0
+	remap_dns_vars net
+	remap_dns_vars wireless
+}
+
+src_install() {
+	make $(make_opts) DESTDIR="${D}" install
+	dodoc ChangeLog COPYRIGHT
+
+	# 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" || -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 || -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
+
+	# Remove the installed runlevels, as we don't know about $ROOT yet
+	rm -rf "${D}/etc/runlevels"
+
+	# Copy the make files to /usr/share/baselayout so we can re-use them in
+	# postinst, otherwise binpkg will break.
+	insinto /usr/share/baselayout
+	doins -r Makefile default.mk runlevels*
+}
+
+pkg_postinst() {
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
+		einfo "Making default runlevels"
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
+	fi
+
+	# 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
+
+	# We need to copy svcdir if upgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
+		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
+		rm -rf "${ROOT}"lib/rcscripts/init.d/daemons
+		umount "${ROOT}${svcdir}" 2>/dev/null
+		rm -rf "${ROOT}${svcdir}"
+		)
+	elif has_version "<sys-apps/${PN}-2.0.0_alpha" ; then
+		# The format has changed since 1.13
+		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
+	fi
+
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		/$(get_libdir)/rcscripts/bin/rc-depend --update
+	fi
+
+	# 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
+	echo "Gentoo Base System release ${PV}" > "${ROOT}"/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!	 You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "	 # etc-update"
+
+	local lo="net.lo0"
+	use kernel_linux && lo="net.lo"
+	for f in ${ROOT}etc/init.d/net.*; do
+		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
+		echo
+		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
+		einfo "They need to be converted to symlinks to ${lo}.	If you haven't"
+		einfo "made personal changes to those files, you can update with the"
+		einfo "following command:"
+		einfo
+		einfo "	 /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
+		break
+	done
+
+	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \
+		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
+			echo
+			ewarn "You have deprecated variables in ${ROOT}etc/conf.d/net"
+			ewarn "or ${ROOT}etc/conf.d/wireless"
+			ewarn
+			ewarn "domain_* -> dns_domain_*"
+			ewarn "nameservers_* -> dns_servers_*"
+			ewarn "searchdomains_* -> dns_search_domains_*"
+			ewarn
+			ewarn "They have been converted for you - ensure that you"
+			ewarn "update them via 'etc-update'"
+	fi
+
+	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
+		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
+			echo
+			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
+			ewarn "that no longer work"
+			ewarn
+			ewarn "You are advised to review the new configuration variables as"
+			ewarn "found in ${ROOT}etc/conf.d/net.example"
+	fi
+
+	# Remove old stuff that may cause problems.
+	if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then
+		rm -f "${ROOT}"/etc/env.d/01hostname
+	fi
+	if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then
+		rm -f "${ROOT}"/etc/{conf.d,init.d}/domainname \
+			"${ROOT}"/etc/runlevels/*/domainname
+		echo
+		ewarn "The domainname init script has been removed in this version."
+		ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how"
+		ewarn "to apply dns/nis information to the loopback interface."
+	fi
+}
+
+# Handle our downgraders
+# We should remove this when <1.13 has been removed from the tree
+pkg_postrm() {
+	# Remove dir if downgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
+		mkdir -p "${ROOT}${svcdir}"
+		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+		rm -rf "${ROOT}${svcdir}"/daemons
+		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
+		rm -rf "${ROOT}lib/rcscripts/init.d"
+		)
+	fi
+}
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4
new file mode 100644
index 000000000000..166ffd16db0a
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4
@@ -0,0 +1,3 @@
+MD5 b613375c009dd05f86c17183fe96f98d baselayout-2.0.0_alpha4.tar.bz2 135316
+RMD160 9404971a51dcc83f8f7da153908e0cc414b6e9eb baselayout-2.0.0_alpha4.tar.bz2 135316
+SHA256 eb54db160380f65d2986bc80165c45859eee4f58bbe694fd093a7c5fdd91359b baselayout-2.0.0_alpha4.tar.bz2 135316