New version, should work with catalyst now, #153057.
authorRoy Marples <uberlord@gentoo.org>
Tue, 31 Oct 2006 09:01:03 +0000 (09:01 +0000)
committerRoy Marples <uberlord@gentoo.org>
Tue, 31 Oct 2006 09:01:03 +0000 (09:01 +0000)
Package-Manager: portage-2.1.2_rc1-r1

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

index 2cb338a627fbb54b2e1d35128a2a180a8349bcd2..b4c65070ee2cb9901c38997d6cd6216c0c5483f7 100644 (file)
@@ -1,10 +1,16 @@
 # 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.356 2006/10/24 18:34:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.357 2006/10/31 09:01:03 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-1.13.0_alpha4 (31 Oct 2006)
+
+  31 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +baselayout-1.13.0_alpha4.ebuild:
+  New version, should work with catalyst now, #153057.
+
 *baselayout-1.13.0_alpha3 (24 Oct 2006)
 
   24 Oct 2006; Roy Marples <uberlord@gentoo.org>
index ad932b7f48a1a41c292cfadb98e9eb9f7f7fb8e1..dc640f8aa210ed6ee0abdb1ba5f8263c45e2386c 100644 (file)
@@ -94,6 +94,7 @@ DIST baselayout-1.12.4.tar.bz2 216448 RMD160 125e0b8c0f02266fa72ce95d4d3ba933118
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
 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
 DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0
 DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA1 428f5971116b1c8d6465e6b826c5cc89621d84db SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
@@ -125,10 +126,14 @@ EBUILD baselayout-1.13.0_alpha3.ebuild 8840 RMD160 2c88750b55617b5e912d74e449111
 MD5 74f5f694a2032510e85c1daab17642b5 baselayout-1.13.0_alpha3.ebuild 8840
 RMD160 2c88750b55617b5e912d74e44911181bb1d79c7e baselayout-1.13.0_alpha3.ebuild 8840
 SHA256 52df0f11416aa7582258ce335f0178b2d0bf94486b87f9734e5270b69a38db3f baselayout-1.13.0_alpha3.ebuild 8840
-MISC ChangeLog 81000 RMD160 2022aaaadf4cf1b87a9e70b5fae802abb6e72ce4 SHA1 a6a401dfc04f54736e47578803848b990cedb9c4 SHA256 519ec9a4eddba6dc91f0d054cf60cdb5259e5616c39564d599a6ffd4536faa65
-MD5 badf89662108ac8f7401ca6c2256ec70 ChangeLog 81000
-RMD160 2022aaaadf4cf1b87a9e70b5fae802abb6e72ce4 ChangeLog 81000
-SHA256 519ec9a4eddba6dc91f0d054cf60cdb5259e5616c39564d599a6ffd4536faa65 ChangeLog 81000
+EBUILD baselayout-1.13.0_alpha4.ebuild 9396 RMD160 82834f10e4bc481cc5251a565c60ff07b157b652 SHA1 0abf14a76fa2faee3c78511b0411d42f899430ab SHA256 457f606f5d5e422b385bb74ff9ee03b3b87335a84c0fb7d72bf8468cbcf3fc0d
+MD5 b8a516577d0bff83976b7fede8e67cff baselayout-1.13.0_alpha4.ebuild 9396
+RMD160 82834f10e4bc481cc5251a565c60ff07b157b652 baselayout-1.13.0_alpha4.ebuild 9396
+SHA256 457f606f5d5e422b385bb74ff9ee03b3b87335a84c0fb7d72bf8468cbcf3fc0d baselayout-1.13.0_alpha4.ebuild 9396
+MISC ChangeLog 81182 RMD160 0dda120b77579cef521b59fd3521fcf34ad4351d SHA1 1384d658651bdc1c09d8c6ee06e6cd1992f78832 SHA256 610f1c2f4857749b780f39a1886f5f583f110c668bd34d0168915fa3c56d714c
+MD5 4e605bcfe86dc3a790442d2a4a8153b4 ChangeLog 81182
+RMD160 0dda120b77579cef521b59fd3521fcf34ad4351d ChangeLog 81182
+SHA256 610f1c2f4857749b780f39a1886f5f583f110c668bd34d0168915fa3c56d714c ChangeLog 81182
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -154,3 +159,6 @@ SHA256 7f790702d2ff391cad3c14ef7346aad9ec4fb1745f5778f72746187086a0ee1e files/di
 MD5 2ba5c5067995adcee92c0ce16fa97117 files/digest-baselayout-1.13.0_alpha3 277
 RMD160 8a8292df4e5469e68f123cf718777e22cc590495 files/digest-baselayout-1.13.0_alpha3 277
 SHA256 f3905ce4d33ac745c159cd336464e674e923bde59ba80a1ac6b4d75a4aa3ee4c files/digest-baselayout-1.13.0_alpha3 277
+MD5 a40776c770f86150d5b33b4b0a637807 files/digest-baselayout-1.13.0_alpha4 277
+RMD160 5028b88defd3012ef82dd9946905edb26a7b46e6 files/digest-baselayout-1.13.0_alpha4 277
+SHA256 e52a8b9a85ec4e43c953e049af003a16c75a32b356fb405c5fc72c41e992fc44 files/digest-baselayout-1.13.0_alpha4 277
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild
new file mode 100644 (file)
index 0000000..be57f38
--- /dev/null
@@ -0,0 +1,277 @@
+# 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.13.0_alpha4.ebuild,v 1.1 2006/10/31 09:01:03 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"
+
+# This version of baselayout needs awk 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.
+RDEPEND="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
+               !build? (
+                       !bootstrap? (
+                               >=sys-libs/readline-5.0-r1
+                               >=app-shells/bash-3.1_p7
+                               kernel_linux? (
+                                       >=sys-apps/coreutils-5.2.1
+                               )
+                               kernel_FreeBSD? (
+                                       sys-process/fuser-bsd
+                                       sys-process/pidof-bsd
+                               )
+                       )
+               )
+               pam? ( virtual/pam )
+               !<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+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  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+               sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+       fi
+}
+
+make_opts() {
+       # Standard options
+       local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\""
+       local libdir="lib"
+
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+       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) || 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" > "${IMAGE}/etc/conf.d/$1"
+       fi
+}
+
+pkg_preinst() {
+       # Move our makefiles to a temporay location
+       mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
+
+       # 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=
+               : ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+                       libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+               fi
+               echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
+       fi
+
+       # rc-scripts version for testing of features that *should* be present
+       echo "Gentoo Base System version ${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() {
+       # 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
+               make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
+       fi
+
+       # Make our runlevels if they don't exist
+       if [[ ! -e ${ROOT}etc/runlevels ]] ; then
+               einfo "Making default runlevels"
+               make -C "${T}" $(make_opts) runlevels_install >/dev/null
+       fi
+
+       if use kernel_linux ; then
+               if use build || use bootstrap ; then
+                       # Create base directories
+                       if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
+                               einfo "Creating dev nodes"
+                               PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
+                                       dev || die "failed to create /dev nodes"
+                       fi
+               elif [[ -w ${ROOT} ]] ; then
+                       # Ensure that we have /dev/null and /dev/console at least
+                       einfo "Ensuring that /dev/null and /dev/console exist on ${ROOT}dev"
+                       mkdir "${T}"/dev
+                       mount -o bind / "${T}/dev"
+                       make -C "${T}" DESTDIR="${T}/dev" ARCH="$(tc-arch)" basedev &>/dev/null
+                       umount "${T}/dev"
+               fi
+       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
+
+       # 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
+               # We need to copy svcdir if it's empty
+               if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
+                       (
+                       source "${ROOT}etc/conf.d/rc"
+                       svcdir="${svcdir:-/var/lib/init.d}"
+                       if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
+                               cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
+                       fi
+                       )
+               fi
+
+               # Regenerate init.d dependency tree
+               /sbin/depscan.sh --update >/dev/null
+
+               # Regenerate /etc/modules.conf, else it will fail at next boot
+               if [[ -x /sbin/modules-update ]] ; then
+                       einfo "Updating module dependencies..."
+                       /sbin/modules-update force >/dev/null
+               fi
+       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
+
+       local lo="net.lo0"
+       use kernel_linux && lo="net.lo"
+       for f in ${ROOT}etc/init.d/net.*; do
+               [[ -L ${f} ]] && 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}"
+               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 '\<(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/{conf.d,init.d}/domainname \
+                       "${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.13.0_alpha4 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha4
new file mode 100644 (file)
index 0000000..13d1718
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 c33999c5913721f7705498c965240c00 baselayout-1.13.0_alpha4.tar.bz2 253009
+RMD160 6d5516a3946d8c426d9b6d3e354622d172e11754 baselayout-1.13.0_alpha4.tar.bz2 253009
+SHA256 dda6700d365109b59f6fd2ddbeeebab479357a534f4c994f49ed4e203ced0deb baselayout-1.13.0_alpha4.tar.bz2 253009