From: Roy Marples Date: Tue, 24 Oct 2006 18:34:52 +0000 (+0000) Subject: New version with a brand new C dependancy resolver. Probably has bugs ... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04e533dfc1d17e16e82197db51fa5c41318a9494;p=gentoo.git New version with a brand new C dependancy resolver. Probably has bugs ... Package-Manager: portage-2.1.2_pre3-r7 --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 43b0db65d7f5..2cb338a627fb 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -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.355 2006/10/19 09:29:43 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.356 2006/10/24 18:34:52 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_alpha3 (24 Oct 2006) + + 24 Oct 2006; Roy Marples + +baselayout-1.13.0_alpha3.ebuild: + New version with a brand new C dependancy resolver. Probably has bugs ... + *baselayout-1.13.0_alpha2-r1 (19 Oct 2006) 19 Oct 2006; Roy Marples diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index aab935126740..ad932b7f48a1 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -93,6 +93,7 @@ SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/co 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.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 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 @@ -120,10 +121,14 @@ EBUILD baselayout-1.13.0_alpha2-r1.ebuild 8885 RMD160 0d9d8f0e5662c1f393575f7bec MD5 24058b372e581254391b88697a70df68 baselayout-1.13.0_alpha2-r1.ebuild 8885 RMD160 0d9d8f0e5662c1f393575f7becbcf5e8dc611f0f baselayout-1.13.0_alpha2-r1.ebuild 8885 SHA256 d58d67446cb24330b9697219eff4af04d7c31cd92c69d73b1be6710b29530e0d baselayout-1.13.0_alpha2-r1.ebuild 8885 -MISC ChangeLog 80797 RMD160 5e261038cf22c75ba6b6bd5d6df42e0adb75e7c5 SHA1 3ff997a8aae06789e43c6dbeded3112b02e20f48 SHA256 0de16c10d23cd2283349b4962653456988398f1cee389445fb4471cc080f2cfb -MD5 a3476e0675acb26749c8997a32c01333 ChangeLog 80797 -RMD160 5e261038cf22c75ba6b6bd5d6df42e0adb75e7c5 ChangeLog 80797 -SHA256 0de16c10d23cd2283349b4962653456988398f1cee389445fb4471cc080f2cfb ChangeLog 80797 +EBUILD baselayout-1.13.0_alpha3.ebuild 8840 RMD160 2c88750b55617b5e912d74e44911181bb1d79c7e SHA1 a0f8f07818bd489d99b390396b7f01cff3e158dc SHA256 52df0f11416aa7582258ce335f0178b2d0bf94486b87f9734e5270b69a38db3f +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 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -146,3 +151,6 @@ SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/di 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 +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 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha3.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha3.ebuild new file mode 100644 index 000000000000..60705dacd141 --- /dev/null +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha3.ebuild @@ -0,0 +1,267 @@ +# 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_alpha3.ebuild,v 1.1 2006/10/24 18:34:52 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 ) + ! "${IMAGE}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + cd "${S}" + + if use build || use bootstrap ; then + make $(make_opts) layout || die "failed to layout filesystem" + 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" + make $(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" + mount -o bind / "${T}" + make DESTDIR="${T}" ARCH="$(tc-arch)" basedev &>/dev/null + umount "${T}" + fi + 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) 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" +} + +pkg_postinst() { + # 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 + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + cd "${S}" + make $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null + fi + + # 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_alpha3 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 new file mode 100644 index 000000000000..e40a14eefa57 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 @@ -0,0 +1,3 @@ +MD5 21f08882073d62d6e706d8c371489060 baselayout-1.13.0_alpha3.tar.bz2 252705 +RMD160 75cbdde44990ffe0d5191fcecf6ca8e7660bd1cf baselayout-1.13.0_alpha3.tar.bz2 252705 +SHA256 a7eacb2efe17eae01933258902635d53ae544da59d5341cbe6a241318c038103 baselayout-1.13.0_alpha3.tar.bz2 252705