From 492bd5f5f31917fd03938af474837dba31144676 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 6 Nov 2006 13:17:33 +0000 Subject: [PATCH] Punt old versions Package-Manager: portage-2.1.2_rc1-r3 --- sys-apps/baselayout/Manifest | 28 -- .../baselayout-1.13.0_alpha2-r1.ebuild | 269 ----------------- .../baselayout-1.13.0_alpha3.ebuild | 267 ----------------- .../baselayout-1.13.0_alpha4.ebuild | 270 ------------------ .../baselayout-1.13.0_alpha2-ssd-bsd.patch | 81 ------ .../files/digest-baselayout-1.13.0_alpha2-r1 | 3 - .../files/digest-baselayout-1.13.0_alpha3 | 3 - .../files/digest-baselayout-1.13.0_alpha4 | 3 - 8 files changed, 924 deletions(-) delete mode 100644 sys-apps/baselayout/baselayout-1.13.0_alpha2-r1.ebuild delete mode 100644 sys-apps/baselayout/baselayout-1.13.0_alpha3.ebuild delete mode 100644 sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild delete mode 100644 sys-apps/baselayout/files/baselayout-1.13.0_alpha2-ssd-bsd.patch delete mode 100644 sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2-r1 delete mode 100644 sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 delete mode 100644 sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha4 diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index cf04af5ce98d..39bacbe3eca6 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -82,10 +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_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 -SHA256 4574ae66e6ad61a75b7dd8431a53e2c241e1a63b63e3989787cd2c3ed84008de files/baselayout-1.13.0_alpha2-ssd-bsd.patch 2110 AUX baselayout-1.13.0_alpha5-2364.patch 2119 RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c SHA1 de222d9ba99d8cece07e1d3665f4087e4209e8fb SHA256 6c7fcc07214fe8e88e4e3fad7fc013427354f662505fa95f657e5634cb3adbc8 MD5 28f5df04fa58d76dd0188d9d4cb9879a files/baselayout-1.13.0_alpha5-2364.patch 2119 RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c files/baselayout-1.13.0_alpha5-2364.patch 2119 @@ -97,9 +93,6 @@ 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.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 DIST baselayout-1.13.0_alpha5.tar.bz2 255507 RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 SHA1 ec76c840cd4f53757de750446ca1eefee997a390 SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e 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 @@ -128,18 +121,6 @@ EBUILD baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e 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 -SHA256 d58d67446cb24330b9697219eff4af04d7c31cd92c69d73b1be6710b29530e0d baselayout-1.13.0_alpha2-r1.ebuild 8885 -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 -EBUILD baselayout-1.13.0_alpha4.ebuild 9086 RMD160 0748d0c35c7296e154138478254edfdaf501556b SHA1 c5621fb28fa94125a1e0c0cbb684cf9635523220 SHA256 0c4b5f1fd4fc75a29741a8d2bb872a75a4a8aa93fffc31ec8d68d713d8cd1483 -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 EBUILD baselayout-1.13.0_alpha5-r1.ebuild 9153 RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee SHA1 0cd5a1d67769e73cc856028f9f0776613254d8e9 SHA256 4e9827ec374154287a3a77586579725864e286b57a3b4770fd2a070f00a33ca7 MD5 3e3e80b2ac3e67a57c43bf89a04d8588 baselayout-1.13.0_alpha5-r1.ebuild 9153 RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee baselayout-1.13.0_alpha5-r1.ebuild 9153 @@ -174,15 +155,6 @@ SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/di 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 -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 MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5 277 RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5 277 SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5 277 diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha2-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha2-r1.ebuild deleted file mode 100644 index 7d1d83d4cbe3..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha2-r1.ebuild +++ /dev/null @@ -1,269 +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-r1.ebuild,v 1.1 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/baselayout-1.13.0_alpha3.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha3.ebuild deleted file mode 100644 index 60705dacd141..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha3.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_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/baselayout-1.13.0_alpha4.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild deleted file mode 100644 index 59cc2941739a..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha4.ebuild +++ /dev/null @@ -1,270 +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_alpha4.ebuild,v 1.2 2006/10/31 14:57:54 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() { - # 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 - 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/baselayout-1.13.0_alpha2-ssd-bsd.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha2-ssd-bsd.patch deleted file mode 100644 index f8dff5ed5378..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha2-ssd-bsd.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: src/start-stop-daemon.c -=================================================================== ---- src/start-stop-daemon.c (revision 2314) -+++ src/start-stop-daemon.c (working copy) -@@ -768,7 +768,7 @@ - /* WTA: this needs to be an autoconf check for /proc/pid existance. - */ - --#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) -+#if defined(OSLinux) || defined (OSsunos) - static void - do_procinit(void) - { -@@ -814,16 +814,18 @@ - #endif /* OSHURD */ - - --#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) -+#if defined(OSFreeBSD) || defined(OSFreeBSD) || defined(OSOpenBSD) - --# if defined(OSNetBSD) --# define _KINFO_PROC2 kinfo_proc2 -+# if defined(OSFreeBSD) || defined(OSOpenBSD) -+# define _KINFO_PROC kinfo_proc -+# define _GET_KINFO_UID(kp) (kp->ki_ruid) -+# define _GET_KINFO_COMM(kp) (kp->ki_comm) -+# define _GET_KINFO_PID(kp) (kp.ki_pid) -+# else -+# define _KINFO_PROC kinfo_proc2 - # define _GET_KINFO_UID(kp) (kp->p_ruid) - # define _GET_KINFO_COMM(kp) (kp->p_comm) --# else --# define _KINFO_PROC2 kinfo_proc --# define _GET_KINFO_UID(kp) (kp->ki_ruid) --# define _GET_KINFO_COMM(kp) (kp->ki_comm) -+# define _GET_KINFO_PID(kp) (kp.p_pid) - # endif - - static int -@@ -872,7 +874,7 @@ - kvm_t *kd; - int nentries; /* Value not used */ - uid_t proc_uid; -- struct _KINFO_PROC2 *kp; -+ struct _KINFO_PROC *kp; - char errbuf[_POSIX2_LINE_MAX]; - - kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf); -@@ -893,7 +895,7 @@ - { - kvm_t *kd; - int nentries; -- struct _KINFO_PROC2 *kp; -+ struct _KINFO_PROC *kp; - char *pidexec; - char *bname = basename(name); - -@@ -911,10 +913,21 @@ - static void - do_procinit(void) - { -- /* Nothing to do */ -+ static kvm_t *kd = NULL; -+ struct _KINFO_PROC *kp; -+ int i, n_processes = 0; -+ -+ if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, NULL)) == NULL) -+ errx(2, "%s", kvm_geterr(kd)); -+ -+ kp = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes); -+ for (i = 0; i < n_processes; i++) -+ check(_GET_KINFO_PID(kp[i])); -+ -+ kvm_close(kd); - } - --#endif /* OSOpenBSD */ -+#endif /* OSBSD */ - - #if defined(OSDarwin) - int diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2-r1 deleted file mode 100644 index 4cb221d92e0f..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha2-r1 +++ /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 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 deleted file mode 100644 index e40a14eefa57..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha3 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha4 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha4 deleted file mode 100644 index 13d171897970..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha4 +++ /dev/null @@ -1,3 +0,0 @@ -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 -- 2.26.2