New version that works with bash-3.2, fixes #151128 and #151108.
authorRoy Marples <uberlord@gentoo.org>
Thu, 2 Nov 2006 10:29:25 +0000 (10:29 +0000)
committerRoy Marples <uberlord@gentoo.org>
Thu, 2 Nov 2006 10:29:25 +0000 (10:29 +0000)
Package-Manager: portage-2.1.2_rc1-r2

sys-apps/baselayout/ChangeLog
sys-apps/baselayout/Manifest
sys-apps/baselayout/baselayout-1.12.6.ebuild [new file with mode: 0644]
sys-apps/baselayout/files/digest-baselayout-1.12.6 [new file with mode: 0644]

index eabeced7dd94656f66b7bc108f759c820fd104d2..fff4e9777186c2c233695d67f44d2a74e41e56c5 100644 (file)
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.358 2006/10/31 14:57:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.359 2006/11/02 10:29:25 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-1.12.6 (02 Nov 2006)
+
+  02 Nov 2006; Roy Marples <uberlord@gentoo.org> +baselayout-1.12.6.ebuild:
+  New version that works with bash-3.2, fixes #151128 and #151108.
+
 *baselayout-1.13.0_alpha4 (31 Oct 2006)
 
   31 Oct 2006; Roy Marples <uberlord@gentoo.org>
index 3a924d161838d58bb955bff28328e669a337ad02..3513a4b4ad2de520796ba3d4d1a943a7e1f27aed 100644 (file)
@@ -92,6 +92,7 @@ RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
 DIST baselayout-1.12.4.tar.bz2 216448 RMD160 125e0b8c0f02266fa72ce95d4d3ba93311871d57 SHA1 26a2fa93db01aecd92d2ae47f193fad0949dc316 SHA256 f09ae36d84ff7f52baf44494dedafcb26a1cbb4e5a0f9ba5ef5f553bc21373da
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
+DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae SHA1 8164fe1923ccdf9d9e38ac0884e2bdd2061681e7 SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862
 DIST baselayout-1.13.0_alpha2.tar.bz2 249320 RMD160 ae8a9acd02461d025d3d0751053bdd697ea5538d SHA1 766e8ca36a52161500b2e681da42b8398cd3cd79 SHA256 62a61de646650662ffc0e19d0f7cb409320cc633aa36d25a2127f140948aea54
 DIST baselayout-1.13.0_alpha3.tar.bz2 252705 RMD160 75cbdde44990ffe0d5191fcecf6ca8e7660bd1cf SHA1 06895b9333512dceb0acf8fc32413b5b27e7db92 SHA256 a7eacb2efe17eae01933258902635d53ae544da59d5341cbe6a241318c038103
 DIST baselayout-1.13.0_alpha4.tar.bz2 253009 RMD160 6d5516a3946d8c426d9b6d3e354622d172e11754 SHA1 99607eeeef1a569a4d6dbe7796c1935361e54526 SHA256 dda6700d365109b59f6fd2ddbeeebab479357a534f4c994f49ed4e203ced0deb
@@ -118,6 +119,10 @@ EBUILD baselayout-1.12.5-r2.ebuild 19784 RMD160 24565a186298aa19350dc6f9ac37900a
 MD5 f280c19d2a5daed282e37801c59ebd79 baselayout-1.12.5-r2.ebuild 19784
 RMD160 24565a186298aa19350dc6f9ac37900ab6ac8e32 baselayout-1.12.5-r2.ebuild 19784
 SHA256 fbfd956d4b78544d79c667ac42135dc75bbc760199adb43234c191bbb858a9a9 baselayout-1.12.5-r2.ebuild 19784
+EBUILD baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e6f75f SHA1 c22ce50ef5c1cc3e72d75fae657dfdb9fee6c75c SHA256 c39675983cc1a94ddedb5822490cb3504230d8dad3df60d36f71e8d035b5d57a
+MD5 bd19081e2814fc4989fb0648ba5fa709 baselayout-1.12.6.ebuild 19713
+RMD160 2a19aa08e7a497843b40d2678ba8695580e6f75f baselayout-1.12.6.ebuild 19713
+SHA256 c39675983cc1a94ddedb5822490cb3504230d8dad3df60d36f71e8d035b5d57a baselayout-1.12.6.ebuild 19713
 EBUILD baselayout-1.13.0_alpha2-r1.ebuild 8885 RMD160 0d9d8f0e5662c1f393575f7becbcf5e8dc611f0f SHA1 cda39581a4af1c4ac58fd651c81cfae619d800f2 SHA256 d58d67446cb24330b9697219eff4af04d7c31cd92c69d73b1be6710b29530e0d
 MD5 24058b372e581254391b88697a70df68 baselayout-1.13.0_alpha2-r1.ebuild 8885
 RMD160 0d9d8f0e5662c1f393575f7becbcf5e8dc611f0f baselayout-1.13.0_alpha2-r1.ebuild 8885
@@ -130,10 +135,10 @@ EBUILD baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254ed
 MD5 89fe580a63cdf58624f048520d6408b2 baselayout-1.13.0_alpha4.ebuild 9086
 RMD160 0748d0c35c7296e154138478254edfdaf501556b baselayout-1.13.0_alpha4.ebuild 9086
 SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483 baselayout-1.13.0_alpha4.ebuild 9086
-MISC ChangeLog 81253 RMD160 2a3ccfdc2f6f3f98dae9a31710302af45450425e SHA1 80339dc2820fa7034f1e5a3b2311651986b94965 SHA256 3c84a99dbbca2cb6cc15f307b5d09fad193801e1abe9fbff535d8e85ccb53421
-MD5 a097a018cb2728bab211981e434beb7c ChangeLog 81253
-RMD160 2a3ccfdc2f6f3f98dae9a31710302af45450425e ChangeLog 81253
-SHA256 3c84a99dbbca2cb6cc15f307b5d09fad193801e1abe9fbff535d8e85ccb53421 ChangeLog 81253
+MISC ChangeLog 81431 RMD160 9b8bf238c748d15ae639eea1363a49bf64408f3f SHA1 95afe98c9c5662582c10a338c02387d7bdb1102c SHA256 568947b018c82e6b6674e89fbc65136ac25949f9afff1f144aafad1d02e69e11
+MD5 ca727c40e23d2b052cfe41a334f1a4d3 ChangeLog 81431
+RMD160 9b8bf238c748d15ae639eea1363a49bf64408f3f ChangeLog 81431
+SHA256 568947b018c82e6b6674e89fbc65136ac25949f9afff1f144aafad1d02e69e11 ChangeLog 81431
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -153,6 +158,9 @@ SHA256 a5d5b90fb977a6aa1d11b1d41e921709965cc1205d74a66f59d23e39ac1d2676 files/di
 MD5 7633bbaedb7a7a35d9a6f82e9f313d20 files/digest-baselayout-1.12.5-r2 256
 RMD160 d4002016cd3fde45b5fef010fcfad5fe8700aacd files/digest-baselayout-1.12.5-r2 256
 SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/digest-baselayout-1.12.5-r2 256
+MD5 646df4c5861a383867d4188f27d8b7d0 files/digest-baselayout-1.12.6 256
+RMD160 19fbf407d2819bb6917b330252c1ed71cc0322bb files/digest-baselayout-1.12.6 256
+SHA256 7d0ed81c4a5f1131c77c84febb52dcb9949dcfd9ce3bbc18ad4299780c92c74b files/digest-baselayout-1.12.6 256
 MD5 b7bb6cb0985423c2dd5b6327a4d81a7d files/digest-baselayout-1.13.0_alpha2-r1 277
 RMD160 7416d97be01ccf1729669622512c1c851a475a4b files/digest-baselayout-1.13.0_alpha2-r1 277
 SHA256 7f790702d2ff391cad3c14ef7346aad9ec4fb1745f5778f72746187086a0ee1e files/digest-baselayout-1.13.0_alpha2-r1 277
diff --git a/sys-apps/baselayout/baselayout-1.12.6.ebuild b/sys-apps/baselayout/baselayout-1.12.6.ebuild
new file mode 100644 (file)
index 0000000..14738b7
--- /dev/null
@@ -0,0 +1,616 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.6.ebuild,v 1.1 2006/11/02 10:29:25 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 x86"
+IUSE="bootstrap build static unicode"
+
+# This version of baselayout needs gawk in /bin, but as we do not have
+# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
+# or "build" are in USE.
+# We need to block old dhcpcd versions as they are no longer in system
+# but may not be in users world file either. See bug #143885
+RDEPEND=">=sys-apps/sysvinit-2.86-r3
+       !build? ( !bootstrap? (
+               >=sys-libs/readline-5.0-r1
+               >=app-shells/bash-3.1_p7
+               >=sys-apps/coreutils-5.2.1
+       ) )
+       !<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers
+       >=sys-apps/portage-2.0.51"
+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
+
+       # Tweak arch-specific details
+       cd "${S}"
+
+       case $(tc-arch) in
+       sparc)
+               sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+               # Disable interactive boot on sparc due to stty calls, #104067
+               sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+               ;;
+       esac
+
+       # Use correct path to filefuncs.so on multilib systems
+       sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
+               ${S}/src/awk/{cachedepends,genenviron}.awk || die
+}
+
+src_compile() {
+       local libdir="lib"
+
+       use static && append-ldflags -static
+
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+       make -C "${S}"/src \
+               CC="$(tc-getCC)" \
+               LD="$(tc-getCC) ${LDFLAGS}" \
+               CFLAGS="${CFLAGS}" \
+               LIBDIR="${libdir}" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+       case $(tc-arch) in
+               # amd64 must use generic-i386 because amd64/x86_64 does not have
+               # a generic option at this time, and the default 'generic' ends
+               # up erroring out, because MAKEDEV internally doesn't know what
+               # to use
+               arm*)    suffix=-arm ;;
+               alpha)   suffix=-alpha ;;
+               amd64)   suffix=-i386 ;;
+               hppa)    suffix=-hppa ;;
+               ia64)    suffix=-ia64 ;;
+               m68k)    suffix=-m68k ;;
+               mips*)   suffix=-mips ;;
+               ppc*)    suffix=-powerpc ;;
+               s390*)   suffix=-s390 ;;
+               sh*)     suffix=-sh ;;
+               sparc*)  suffix=-sparc ;;
+               x86)     suffix=-i386 ;;
+       esac
+
+       einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
+       MAKEDEV generic${suffix}
+       MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+}
+
+# This is a temporary workaround until bug 9849 is completely solved
+# in portage.  We need to create the directories so they're available
+# during src_install, but when src_install is finished, call unkdir
+# to remove any empty directories instead of leaving them around.
+kdir() {
+       typeset -a args
+       typeset d
+
+       # Create the directories for the remainder of src_install, and
+       # remember how to create the directories later.
+       for d in "$@"; do
+               if [[ $d == /* ]]; then
+                       install -d "${args[@]}" "${D}/${d}"
+                       cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+       install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+               || ewarn "  can't create ${d}"
+       touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+               || ewarn "  can't create ${d}/.keep"
+fi
+EOF
+               else
+                       args=("${args[@]}" "${d}")
+               fi
+       done
+}
+
+# Continued from kdir above...  This function removes any empty
+# directories as a temporary workaround for bug 9849.  The directories
+# (and .keep files) are re-created in pkg_postinst, which means they
+# aren't listed in CONTENTS, unfortunately.
+unkdir() {
+       einfo "Running unkdir to workaround bug 9849"
+       find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null
+       if [[ $? == 127 ]]; then
+               ewarn "Problem running unkdir: find command not found"
+       fi
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+       echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' ; }" \
+               >> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+src_install() {
+       local dir libdirs libdirs_env rcscripts_dir
+
+       # This directory is to stash away things that will be used in
+       # pkg_postinst; it's needed first for kdir to function
+       dodir /usr/share/baselayout
+
+       # Jeremy Huddleston <eradicator@gentoo.org>
+       # For multilib, we want to make sure that all our multilibdirs exist
+       # and make lib even if it's not listed as one (like on amd64/ppc64
+       # which sometimes has lib32/lib64 instead of lib/lib64).
+       # lib should NOT be a symlink to one of the other libdirs.
+       # Old systems with symlinks won't be affected by this change, as the
+       # symlinks already exist and won't get removed, but new systems will
+       # be setup properly.
+       #
+       # I'll be making a script to convert existing systems from symlink to
+       # nosymlink and putting it in /usr/portage/scripts.
+       libdirs=$(get_all_libdirs)
+       : ${libdirs:=lib}       # it isn't that we don't trust multilib.eclass...
+
+       # This should be /lib/rcscripts, but we have to support old profiles too.
+       if [[ ${SYMLINK_LIB} == "yes" ]]; then
+               rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+       else
+               rcscripts_dir="/lib/rcscripts"
+       fi
+
+       einfo "Creating directories..."
+       kdir /usr
+       kdir /usr/local
+       kdir /boot
+       kdir /dev
+       kdir /dev/pts
+       kdir /dev/shm
+       kdir /etc/conf.d
+       kdir /etc/cron.daily
+       kdir /etc/cron.hourly
+       kdir /etc/cron.monthly
+       kdir /etc/cron.weekly
+       kdir /etc/env.d
+       dodir /etc/init.d                       # .keep file might mess up init.d stuff
+       kdir /etc/modules.autoload.d
+       kdir /etc/modules.d
+       kdir /etc/opt
+       kdir /home
+       kdir ${rcscripts_dir}
+       kdir ${rcscripts_dir}/awk
+       kdir ${rcscripts_dir}/sh
+       kdir ${rcscripts_dir}/net
+       # Only install /mnt stuff at bootstrap time #88835 / #90022
+       if use build ; then
+               kdir /mnt
+               kdir -m 0700 /mnt/cdrom
+               kdir -m 0700 /mnt/floppy
+       fi
+       kdir /opt
+       kdir -o root -g uucp -m0775 /var/lock
+       kdir /proc
+       kdir -m 0700 /root
+       kdir /sbin
+       kdir /sys       # for 2.6 kernels
+       kdir /usr/bin
+       kdir /usr/include
+       kdir /usr/include/asm
+       kdir /usr/include/linux
+       kdir /usr/local/bin
+       kdir /usr/local/games
+       kdir /usr/local/sbin
+       kdir /usr/local/share
+       kdir /usr/local/share/doc
+       kdir /usr/local/share/man
+       kdir /usr/local/src
+       kdir ${PORTDIR}
+       kdir /usr/sbin
+       kdir /usr/share/doc
+       kdir /usr/share/info
+       kdir /usr/share/man
+       kdir /usr/share/misc
+       kdir /usr/src
+       kdir -m 1777 /tmp
+       kdir /var
+       dodir /var/db/pkg                       # .keep file messes up Portage
+       kdir /var/lib/misc
+       kdir /var/lock/subsys
+       kdir /var/log/news
+       kdir /var/run
+       kdir /var/spool
+       kdir /var/state
+       kdir -m 1777 /var/tmp
+
+       for dir in ${libdirs}; do
+               libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+               [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+               kdir /${dir}
+               kdir /usr/${dir}
+               kdir /usr/local/${dir}
+       done
+
+       # Ugly compatibility with stupid ebuilds and old profiles symlinks
+       if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+               rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+               ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+               ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+               ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+       fi
+
+       kdir /lib/dev-state
+       kdir /lib/udev-state
+
+       # FHS compatibility symlinks stuff
+       ksym /var/tmp /usr/tmp
+       ksym share/man /usr/local/man
+
+       #
+       # Setup files in /etc
+       #
+       insopts -m0644
+       insinto /etc
+       doins -r "${S}"/etc/*
+       fperms 0640 /etc/sysctl.conf
+
+       # Install some files to /usr/share/baselayout instead of /etc to keep from
+       # (1) overwriting the user's settings, (2) screwing things up when
+       # attempting to merge files, (3) accidentally packaging up personal files
+       # with quickpkg
+       fperms 0600 /etc/shadow
+       mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout
+
+       # doinitd doesnt respect symlinks
+       dodir /etc/init.d
+       cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+       #doinitd "${S}"/init.d/* || die "doinitd"
+       doconfd "${S}"/etc/conf.d/* || die "doconfd"
+       doenvd "${S}"/etc/env.d/* || die "doenvd"
+       insinto /etc/modules.autoload.d
+       doins "${S}"/etc/modules.autoload.d/*
+       insinto /etc/modules.d
+       doins "${S}"/etc/modules.d/*
+
+       # 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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+               libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+       fi
+
+       # 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
+               echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+       fi
+
+       # As of baselayout-1.10-1-r1, sysvinit is its own package again, and
+       # provides the inittab itself
+       rm -f "${D}"/etc/inittab
+
+       # Stash the rc-lists for use during pkg_postinst
+       cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
+
+       # rc-scripts version for testing of features that *should* be present
+       echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release
+
+       #
+       # Setup files related to /dev
+       #
+       into /
+       dosbin "${S}"/sbin/MAKEDEV
+       dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
+       dosym ../sbin/MAKEDEV /dev/MAKEDEV
+
+       #
+       # Setup files in /bin
+       #
+       cd "${S}"/bin
+       dobin rc-status
+
+       #
+       # Setup files in /sbin
+       #
+       cd "${S}"/sbin
+       into /
+       dosbin rc rc-update
+       # Need this in /sbin, as it could be run before
+       # /usr is mounted.
+       dosbin modules-update
+       # Compat symlinks until I can get things synced.
+       dosym modules-update /sbin/update-modules
+       dosym ../../sbin/modules-update /usr/sbin/update-modules
+       # These moved from /etc/init.d/ to /sbin to help newb systems
+       # from breaking
+       dosbin runscript.sh functions.sh
+
+       # Compat symlinks between /etc/init.d and /sbin
+       # (some stuff have hardcoded paths)
+       dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
+       dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
+       dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+       #
+       # Setup files in /lib/rcscripts
+       # These are support files for other things in baselayout that needn't be
+       # under CONFIG_PROTECTed /etc
+       #
+       cd "${S}"/sbin
+       exeinto ${rcscripts_dir}/sh
+       doexe rc-services.sh rc-daemon.sh rc-help.sh
+
+       # We can only install new, fast awk versions of scripts
+       # if 'build' or 'bootstrap' is not in USE.  This will
+       # change if we have sys-apps/gawk-3.1.1-r1 or later in
+       # the build image ...
+       if ! use build; then
+               # This is for new depscan.sh and env-update.sh
+               # written in awk
+               cd "${S}"/sbin
+               into /
+               dosbin depscan.sh
+               dosbin env-update.sh
+               insinto ${rcscripts_dir}/awk
+               doins "${S}"/src/awk/*.awk
+       fi
+
+       # Original design had these in /etc/net.modules.d but that is too
+       # problematic with CONFIG_PROTECT
+       dodir ${rcscripts_dir}
+       cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
+       chown -R root:0 ${D}${rcscripts_dir}
+
+       #
+       # Install baselayout documentation
+       #
+       if ! use build ; then
+               doman "${S}"/man/*.*
+               docinto /
+               dodoc ${FILESDIR}/copyright
+               dodoc "${S}"/ChangeLog
+       fi
+
+       #
+       # Install baselayout utilities
+       #
+       local libdir="lib"
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+       cd "${S}"/src
+       make DESTDIR="${D}" LIBDIR="${libdir}" install || die
+
+       # Hack to fix bug 9849, continued in pkg_postinst
+       unkdir
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+       local f="$1"
+
+       if [[ -f ${ROOT}/etc/conf.d/${f} ]]; 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/${f} > ${IMAGE}/etc/conf.d/${f}
+       fi
+}
+
+pkg_preinst() {
+       if [[ -f ${ROOT}/etc/modules.autoload && \
+                       ! -d ${ROOT}/etc/modules.autoload.d ]]; then
+               mkdir -p ${ROOT}/etc/modules.autoload.d
+               mv -f ${ROOT}/etc/modules.autoload \
+                       ${ROOT}/etc/modules.autoload.d/kernel-2.4
+               ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
+       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
+}
+
+pkg_postinst() {
+       local x y
+
+       # Reincarnate dirs from kdir/unkdir (hack for bug 9849)
+       einfo "Creating directories and .keep files."
+       einfo "Some of these might fail if they're read-only mounted"
+       einfo "filesystems, for example /dev or /proc.  That's okay!"
+       source "${ROOT}"/usr/share/baselayout/mkdirs.sh
+       source "${ROOT}"/usr/share/baselayout/mklinks.sh
+       echo
+
+       # This could be done in src_install, which would have the benefit of
+       # (1) devices.tar.bz2 would show up in CONTENTS
+       # (2) binary installations would be faster... just untar the devices tarball
+       #     instead of needing to run MAKEDEV
+       # However the most common cases are that people are either updating
+       # baselayout or installing from scratch.  In the installation case, it's no
+       # different to have here instead of src_install.  In the update case, we
+       # save a couple minutes time by refraining from building the unnecessary
+       # tarball.
+       if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
+               # Create a directory in which to work
+               x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
+                       && cd "${x}" || die 'mktemp failed'
+
+               # Create temp device nodes
+               echo
+               einfo "Making device node tarball (this could take a couple minutes)"
+               PATH=${ROOT}/sbin:${PATH} create_dev_nodes
+
+               # Now create tarball that can also be used for udev.
+               # Need GNU tar for -j so call it by absolute path.
+               /bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" *
+               rm -r *
+               cd ..
+               rmdir "${x}"
+       fi
+
+       # We don't want to create devices if this is not a bootstrap and devfs
+       # is used, as this was the cause for all the devfs problems we had
+       if use build || use bootstrap; then
+               if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
+                       einfo "Populating /dev with device nodes..."
+                       cd ${ROOT}/dev || die
+                       tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
+               fi
+       fi
+
+       # Create /boot/boot symlink in pkg_postinst because sometimes
+       # /boot is a FAT filesystem.  When that is the case, then the
+       # symlink will fail.  Consequently, if we create it in
+       # src_install, then merge will fail.  AFAIK there is no point to
+       # this symlink except for misconfigured grubs.  See bug 50108
+       # (05 May 2004 agriffis)
+       ln -sn . "${ROOT}"/boot/boot 2>/dev/null
+
+       # Set up default runlevel symlinks
+       # This used to be done in src_install but required knowledge of ${ROOT},
+       # which meant that it was effectively broken for binary installs.
+       if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
+               for x in boot default nonetwork single; do
+                       einfo "Creating default runlevel symlinks for ${x}"
+                       mkdir -p "${ROOT}"/etc/runlevels/${x}
+                       for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
+                               if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
+                                       ewarn "init.d/${y} not found -- ignoring"
+                               else
+                                       ln -sfn /etc/init.d/${y} \
+                                               "${ROOT}"/etc/runlevels/${x}/${y}
+                               fi
+                       done
+               done
+       fi
+
+       # Create /etc/hosts in pkg_postinst so we don't overwrite an
+       # existing file during bootstrap
+       if [[ ! -e ${ROOT}/etc/hosts ]]; then
+               cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+       fi
+
+       # Touching /etc/passwd and /etc/shadow after install can be fatal, as many
+       # new users do not update them properly...  see src_install() for why they
+       # are in /usr/share/baselayout/
+       for x in passwd shadow group fstab ; do
+               if [[ -e ${ROOT}/etc/${x} ]] ; then
+                       touch "${ROOT}/etc/${x}"
+               else
+                       cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+               fi
+       done
+
+       # Under what circumstances would mtab be a symlink?  It would be
+       # nice if there were an explanatory comment here
+       if [[ -L ${ROOT}/etc/mtab ]]; then
+               rm -f "${ROOT}/etc/mtab"
+               if [[ ${ROOT} == / ]]; then
+                       cp /proc/mounts "${ROOT}/etc/mtab"
+               else
+                       touch "${ROOT}/etc/mtab"
+               fi
+       fi
+
+       # We should only install empty files if these files don't already exist.
+       [[ -e ${ROOT}/var/log/lastlog ]] || \
+               touch "${ROOT}/var/log/lastlog"
+       [[ -e ${ROOT}/var/run/utmp ]] || \
+               install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
+       [[ -e ${ROOT}/var/log/wtmp ]] || \
+               install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
+
+       # Reload init to fix unmounting problems of / on next reboot.
+       # This is really needed, as without the new version of init cause init
+       # not to quit properly on reboot, and causes a fsck of / on next reboot.
+       if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+               # Regenerate init.d dependency tree
+               /sbin/depscan.sh --update &>/dev/null
+
+               # Regenerate /etc/modules.conf, else it will fail at next boot
+               einfo "Updating module dependencies..."
+               /sbin/modules-update force &>/dev/null
+       else
+               rm -f ${ROOT}/etc/modules.conf
+       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 version ${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"
+       echo
+
+       for f in ${ROOT}etc/init.d/net.* ; do
+               [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue
+               echo
+               einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
+               einfo "They need to be converted to symlinks to net.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 '/net.lo$' | xargs -n1 ln -sfvn net.lo"
+               echo
+               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 depreciated 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'"
+                       echo
+       fi
+
+       if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
+               | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then
+                       echo
+                       ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
+                       ewarn
+                       ewarn "You are advised to review the new configuration variables as"
+                       ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
+                       ewarn "guarantee that they will work in future versions."
+                       echo
+       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/init.d/domainname
+               rm -f "${ROOT}"/etc/runlevels/*/domainname
+               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
+}
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.6 b/sys-apps/baselayout/files/digest-baselayout-1.12.6
new file mode 100644 (file)
index 0000000..d8d3e5e
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 062ecbba57c9f6839b38034e48dd932d baselayout-1.12.6.tar.bz2 221279
+RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae baselayout-1.12.6.tar.bz2 221279
+SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862 baselayout-1.12.6.tar.bz2 221279