From: Roy Marples Date: Thu, 19 Oct 2006 09:36:57 +0000 (+0000) Subject: Punt some stuff X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e98d0e78f9b8c8dffdb8a4f57d05acfcdfed5203;p=gentoo.git Punt some stuff Package-Manager: portage-2.1.2_pre3-r4 --- diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index d83bb6eb0d27..aab935126740 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -82,14 +82,6 @@ AUX baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6 MD5 05e23d7d8cd139821113afb7d6ef56cc files/baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6007156 files/baselayout-1.12.5-dmesg.patch 5202 SHA256 837ed3be21597ae44de1debe5f48460945039cf1f4b7de9f067d5e78bb83a0c6 files/baselayout-1.12.5-dmesg.patch 5202 -AUX baselayout-1.13.0_alpha1-fbsddev.patch 592 RMD160 c025ae39cd8494dbc6f1dd8e116018a65b5274fc SHA1 961f5e0f6ee8a261be53cd1887bf41e0f9f791aa SHA256 18beefe1f27ba92ec4eb24d0e36af3d5581616fde29ca5579da20499adc7d950 -MD5 edcdc2284b19d5b41d4f5cb92a5decba files/baselayout-1.13.0_alpha1-fbsddev.patch 592 -RMD160 c025ae39cd8494dbc6f1dd8e116018a65b5274fc files/baselayout-1.13.0_alpha1-fbsddev.patch 592 -SHA256 18beefe1f27ba92ec4eb24d0e36af3d5581616fde29ca5579da20499adc7d950 files/baselayout-1.13.0_alpha1-fbsddev.patch 592 -AUX baselayout-1.13.0_alpha1-init-perms.patch 915 RMD160 3431cd28ce7ea8c3dc069222c74a016d716bdd6e SHA1 3feb7eabc8128d822fb5fe03cb57f4365f5babad SHA256 f873548f09ca94fd588a0c8d7472067d14b91b4fc9cb7b03528db316b5d2c48a -MD5 76be19b7d38409068e6fe56f3e618702 files/baselayout-1.13.0_alpha1-init-perms.patch 915 -RMD160 3431cd28ce7ea8c3dc069222c74a016d716bdd6e files/baselayout-1.13.0_alpha1-init-perms.patch 915 -SHA256 f873548f09ca94fd588a0c8d7472067d14b91b4fc9cb7b03528db316b5d2c48a files/baselayout-1.13.0_alpha1-init-perms.patch 915 AUX baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 RMD160 c2af027058e61f0f68f0b136b5603a850eaea956 SHA1 3564a2b49b7b17c82b4cbe09af37783b7199d10e SHA256 4574ae66e6ad61a75b7dd8431a53e2c241e1a63b63e3989787cd2c3ed84008de MD5 049706d1fa5f3818384f37200a304cde files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 RMD160 c2af027058e61f0f68f0b136b5603a850eaea956 files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 @@ -100,7 +92,6 @@ 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.13.0_alpha1.tar.bz2 227012 RMD160 5d1662a79c2446931c97fc20ee2a6ef55bd8c177 SHA1 4c9d6cfb2d09ea8fc01eb8a2ade10a97bcc7d823 SHA256 765969e52a83a5be560bd718dc4d98296377a106b89b73d8a3cc16f88f56b2b7 DIST baselayout-1.13.0_alpha2.tar.bz2 249320 RMD160 ae8a9acd02461d025d3d0751053bdd697ea5538d SHA1 766e8ca36a52161500b2e681da42b8398cd3cd79 SHA256 62a61de646650662ffc0e19d0f7cb409320cc633aa36d25a2127f140948aea54 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 @@ -125,18 +116,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.13.0_alpha1-r1.ebuild 9040 RMD160 94e54408a0db88b3a509f9abb0ce7b68596258fd SHA1 608f3dd3424dc15638b97304f38516a92cdeb472 SHA256 25304dc27eddec352a6c9ecfbdcf3fa6e43051b76dd4d8f72ff4cf7b39695fc9 -MD5 9d91ccd3a61ad222efd27e5f336eca11 baselayout-1.13.0_alpha1-r1.ebuild 9040 -RMD160 94e54408a0db88b3a509f9abb0ce7b68596258fd baselayout-1.13.0_alpha1-r1.ebuild 9040 -SHA256 25304dc27eddec352a6c9ecfbdcf3fa6e43051b76dd4d8f72ff4cf7b39695fc9 baselayout-1.13.0_alpha1-r1.ebuild 9040 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 SHA256 d58d67446cb24330b9697219eff4af04d7c31cd92c69d73b1be6710b29530e0d baselayout-1.13.0_alpha2-r1.ebuild 8885 -EBUILD baselayout-1.13.0_alpha2.ebuild 8840 RMD160 0eece24c6ebc4d2758f0c09fdeef292771470702 SHA1 8d2012aaadf47ca33f799da649f3655e8d0e8f8c SHA256 fe9790cfee2a6f050ba72f20a6e7025b34c831607323ae54dff3883a0f2eff10 -MD5 d7de45b37002b0bf4bf1278799651e2a baselayout-1.13.0_alpha2.ebuild 8840 -RMD160 0eece24c6ebc4d2758f0c09fdeef292771470702 baselayout-1.13.0_alpha2.ebuild 8840 -SHA256 fe9790cfee2a6f050ba72f20a6e7025b34c831607323ae54dff3883a0f2eff10 baselayout-1.13.0_alpha2.ebuild 8840 MISC ChangeLog 80797 RMD160 5e261038cf22c75ba6b6bd5d6df42e0adb75e7c5 SHA1 3ff997a8aae06789e43c6dbeded3112b02e20f48 SHA256 0de16c10d23cd2283349b4962653456988398f1cee389445fb4471cc080f2cfb MD5 a3476e0675acb26749c8997a32c01333 ChangeLog 80797 RMD160 5e261038cf22c75ba6b6bd5d6df42e0adb75e7c5 ChangeLog 80797 @@ -160,12 +143,6 @@ 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 402bbb67e4adaf854d7d905b6390c296 files/digest-baselayout-1.13.0_alpha1-r1 277 -RMD160 7da462e0ce05085dba1db5c50fbce4f91efe30c5 files/digest-baselayout-1.13.0_alpha1-r1 277 -SHA256 be59fd1488ef13ab615bf33bcbd3d49c5b41ce8505f587354641243670d83478 files/digest-baselayout-1.13.0_alpha1-r1 277 -MD5 b7bb6cb0985423c2dd5b6327a4d81a7d files/digest-baselayout-1.13.0_alpha2 277 -RMD160 7416d97be01ccf1729669622512c1c851a475a4b files/digest-baselayout-1.13.0_alpha2 277 -SHA256 7f790702d2ff391cad3c14ef7346aad9ec4fb1745f5778f72746187086a0ee1e files/digest-baselayout-1.13.0_alpha2 277 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.13.0_alpha1-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha1-r1.ebuild deleted file mode 100644 index 6ac0d3833d05..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha1-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# 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_alpha1-r1.ebuild,v 1.2 2006/10/06 22:49:42 flameeyes 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 ~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 - >=sys-apps/sysvinit-2.86-r3 - ) - kernel_FreeBSD? ( - sys-process/fuser-bsd - sys-process/pidof-bsd - ) - ) - ) - ! "${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() { - local PAMFLAGS= - use kernel_linux && use pam && PAMFLAGS="-DHAVE_PAM -lpam" - make $(make_opts) PAMFLAGS="${PAMFLAGS}" install - dodoc ChangeLog "${FILESDIR}"/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 - - # 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 - [[ -e "${D}"/etc/shadow ]] && fperms 0600 /etc/shadow - for x in passwd shadow group fstab hosts ; do - [[ -e "${D}/etc/${x}" ]] || continue - mv "${D}/etc/${x}" "${D}"/usr/share/baselayout - done - - # Remove the installed runlevels, as we don't know about $ROOT yet - rm -rf "${D}/etc/runlevels" -} - -pkg_postinst() { - # Copy our files in share back if they do not exist - for x in passwd shadow group fstab hosts ; 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/baselayout-1.13.0_alpha2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha2.ebuild deleted file mode 100644 index bfac657d22d5..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha2.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# 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_alpha2.ebuild,v 1.3 2006/10/19 09:29:43 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/baselayout-1.13.0_alpha1-fbsddev.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha1-fbsddev.patch deleted file mode 100644 index 047cedee7560..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha1-fbsddev.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: baselayout-1.13.0_alpha1/Makefile -=================================================================== ---- baselayout-1.13.0_alpha1.orig/Makefile -+++ baselayout-1.13.0_alpha1/Makefile -@@ -18,13 +18,13 @@ ARCH = x86 - OS = Linux - - BASE_DIRS = /$(LIB)/rcscripts/init.d /$(LIB)/rcscripts/tmp --KEEP_DIRS = /boot /dev /proc /home \ -+KEEP_DIRS = /boot /proc /home \ - /mnt/cdrom /mnt/floppy \ - /usr/local/bin /usr/local/sbin /usr/local/share/doc /usr/local/share/man \ - /var/run - - ifeq ($(OS),Linux) -- KEEP_DIRS += sys -+ KEEP_DIRS += sys /dev - NET_LO = net.lo - endif - ifneq ($(OS),Linux) diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha1-init-perms.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha1-init-perms.patch deleted file mode 100644 index fd4af6f898a5..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha1-init-perms.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: init.d.Linux/Makefile -=================================================================== ---- init.d.Linux/Makefile (revision 2297) -+++ init.d.Linux/Makefile (working copy) -@@ -1,6 +1,6 @@ - DIR = /etc/init.d --FILES = consolefont keymaps modules numlock rmnologin --EXES = shutdown.sh reboot.sh -+EXES = consolefont keymaps modules numlock rmnologin \ -+ shutdown.sh reboot.sh - - TOPDIR = .. - include $(TOPDIR)/default.mk -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 2299) -+++ ChangeLog (working copy) -@@ -1,6 +1,10 @@ - # ChangeLog for Gentoo System Intialization ("rc") scripts - # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 - -+ 02 Oct 2006; Roy Marples : -+ -+ Fix init script permissions, #149869. -+ - * baselayout-1.13.0_alpha1 (02 Oct 2006) - - 02 Oct 2006; Roy Marples : diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha1-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha1-r1 deleted file mode 100644 index 66bd930ab349..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 958211759b8e8f05a82a1d84d599ee8c baselayout-1.13.0_alpha1.tar.bz2 227012 -RMD160 5d1662a79c2446931c97fc20ee2a6ef55bd8c177 baselayout-1.13.0_alpha1.tar.bz2 227012 -SHA256 765969e52a83a5be560bd718dc4d98296377a106b89b73d8a3cc16f88f56b2b7 baselayout-1.13.0_alpha1.tar.bz2 227012 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2 deleted file mode 100644 index 4cb221d92e0f..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 96ba59e87ae50ac590219fd104cc72f2 baselayout-1.13.0_alpha2.tar.bz2 249320 -RMD160 ae8a9acd02461d025d3d0751053bdd697ea5538d baselayout-1.13.0_alpha2.tar.bz2 249320 -SHA256 62a61de646650662ffc0e19d0f7cb409320cc633aa36d25a2127f140948aea54 baselayout-1.13.0_alpha2.tar.bz2 249320