From: Roy Marples Date: Tue, 19 Dec 2006 17:11:57 +0000 (+0000) Subject: Punt old versions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b69e88c07809710b80c40df353d07c4652778463;p=gentoo.git Punt old versions Package-Manager: portage-2.1.2_rc3-r7 --- diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 5cdc78fed817..77a80e85d421 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -82,18 +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.12.7-halt.patch 791 RMD160 1ca883d70a7a870f5b8574fbcb26298652f4ded0 SHA1 a2a6c107ffae80b933c28cec9414d1b77718e4b8 SHA256 1763f11a5782b646801af1ce197ac92b155f99d02641d01619fb9911039e2e37 -MD5 957997bbf94234262996344a6790bb73 files/baselayout-1.12.7-halt.patch 791 -RMD160 1ca883d70a7a870f5b8574fbcb26298652f4ded0 files/baselayout-1.12.7-halt.patch 791 -SHA256 1763f11a5782b646801af1ce197ac92b155f99d02641d01619fb9911039e2e37 files/baselayout-1.12.7-halt.patch 791 -AUX baselayout-1.12.7-ifconfig.patch 941 RMD160 ba51d02f9d491d678bb9723bf6a155025719df5d SHA1 ec0a18a5f488871546637ec5058807b83b73437d SHA256 3e314527b3b9bb2780ce570d92bb038c82c87abc001b44ebc76ef3733791ca0c -MD5 de46ee8253ddd51cd9f2cbfdfb154c9a files/baselayout-1.12.7-ifconfig.patch 941 -RMD160 ba51d02f9d491d678bb9723bf6a155025719df5d files/baselayout-1.12.7-ifconfig.patch 941 -SHA256 3e314527b3b9bb2780ce570d92bb038c82c87abc001b44ebc76ef3733791ca0c files/baselayout-1.12.7-ifconfig.patch 941 -AUX baselayout-1.13.0_alpha9-ifconfig.patch 1197 RMD160 03441ec09c7f7ca671b332f938594644961b9b51 SHA1 6e62ea3e63022938a31dea9b3994773b487b36ad SHA256 c591cb5e322042d7a0788335c36e5ea05e3c26d60d6776783e7359630841f093 -MD5 565734ac3ee00122eb5713021637705e files/baselayout-1.13.0_alpha9-ifconfig.patch 1197 -RMD160 03441ec09c7f7ca671b332f938594644961b9b51 files/baselayout-1.13.0_alpha9-ifconfig.patch 1197 -SHA256 c591cb5e322042d7a0788335c36e5ea05e3c26d60d6776783e7359630841f093 files/baselayout-1.13.0_alpha9-ifconfig.patch 1197 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099 @@ -101,10 +89,8 @@ 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.12.7.tar.bz2 221590 RMD160 885c424cf34d2a9b2d814bad91f7902ea8182079 SHA1 e9ec18b8521b055274032bcfb38ff41ef954ad3b SHA256 52fddebeb156a49712e35a98de4a30fe23ee0e541b2b12d4195ed45193b735ca DIST baselayout-1.12.8.tar.bz2 218298 RMD160 2a47bf00db9c1e15ad2dd90e02dc55a896e3e01f SHA1 5d7274e64b8d17a77519e73303390f4d63f958ee SHA256 c05e126ee1b5bd63462db133c4e39ca45b0a999696f637f2a80d9c7b616eeeea DIST baselayout-1.13.0_alpha10.tar.bz2 255190 RMD160 930065e8fd850ad1247c639293ab05ff499409d1 SHA1 ae5f9e403610335a8e9e6e7ec4eed9a1ab62bd7f SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 -DIST baselayout-1.13.0_alpha9.tar.bz2 259509 RMD160 424a8b902fd981976994c33660fe7e54c983e566 SHA1 6112c6cc50b569defad6361de9bf65d10c889a1a SHA256 a5727dbce99d47e27e5b28f4a71f331eb1c232a266c29065b143849cfa57ff17 DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA1 6f370fe293f83974af26d042448dc101b1603eb1 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 @@ -132,14 +118,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.12.7-r3.ebuild 17005 RMD160 841c32443a99f0703c6a001ad65f8e2685f35a6e SHA1 b22d555e52878b4560f61d9b5c5dbb7663973316 SHA256 54dbb83822d88f0c7d117e169a6ff38b984c7f9d7dc19f314570a15714506441 -MD5 c463bf8f8eecad6448b2a463276b409d baselayout-1.12.7-r3.ebuild 17005 -RMD160 841c32443a99f0703c6a001ad65f8e2685f35a6e baselayout-1.12.7-r3.ebuild 17005 -SHA256 54dbb83822d88f0c7d117e169a6ff38b984c7f9d7dc19f314570a15714506441 baselayout-1.12.7-r3.ebuild 17005 -EBUILD baselayout-1.12.7-r4.ebuild 17119 RMD160 676581eb5f3f8b5303db0ac93ac71cf4ab958692 SHA1 cead14f2c5932e95d770dcd5cc00a8e458411a19 SHA256 46a99024d17cbcac4d20f19b50881b01c059080cabf85ea825cd275f75c4fa1d -MD5 ac3a87ec40ae5234d3e90b41abbca0b1 baselayout-1.12.7-r4.ebuild 17119 -RMD160 676581eb5f3f8b5303db0ac93ac71cf4ab958692 baselayout-1.12.7-r4.ebuild 17119 -SHA256 46a99024d17cbcac4d20f19b50881b01c059080cabf85ea825cd275f75c4fa1d baselayout-1.12.7-r4.ebuild 17119 EBUILD baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 SHA1 a2110deb651437e356ae4f9ce9b7d5b0d6e4f89e SHA256 2de062a8fff51618f17af46395ab9a202d229d86e8e0f8fe713da344ec3d4d9a MD5 082aa588289d254af8bbdfbf37f0a05e baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 baselayout-1.12.8.ebuild 17035 @@ -148,10 +126,6 @@ EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979 -EBUILD baselayout-1.13.0_alpha9-r3.ebuild 9981 RMD160 a1a817145f97b028f2cea526301969c4d15d6ba5 SHA1 085af3429587b76cbc4271534fe9d5a6f2eac2cb SHA256 24c11f85edf89064064b6654fceb6b91c0e4adb0cffee4d0eaab1fd43b999bd9 -MD5 29d58ca7a5b103d70d3b09826f38d944 baselayout-1.13.0_alpha9-r3.ebuild 9981 -RMD160 a1a817145f97b028f2cea526301969c4d15d6ba5 baselayout-1.13.0_alpha9-r3.ebuild 9981 -SHA256 24c11f85edf89064064b6654fceb6b91c0e4adb0cffee4d0eaab1fd43b999bd9 baselayout-1.13.0_alpha9-r3.ebuild 9981 MISC ChangeLog 85704 RMD160 46771d73d4fcc98c1707aa9e0fe173a1f9254b8e SHA1 a3cc6569830635a5391a3d65ef0bccc0e57fde0a SHA256 bbb551fb9a6b4b90686422f7550039532c786d08da7b2d691bfc155c97f8a1ed MD5 55042314f06032dbdc049e7472a7a006 ChangeLog 85704 RMD160 46771d73d4fcc98c1707aa9e0fe173a1f9254b8e ChangeLog 85704 @@ -178,18 +152,9 @@ 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 3c673749991736611feecc204537d0b9 files/digest-baselayout-1.12.7-r3 256 -RMD160 a60fb330f3878b7573f51b2f5e213823bba5b613 files/digest-baselayout-1.12.7-r3 256 -SHA256 9fea638948b58f1ff656b3acc35f412ac3aa70279efe0fe703ff495fd1a79d5b files/digest-baselayout-1.12.7-r3 256 -MD5 3c673749991736611feecc204537d0b9 files/digest-baselayout-1.12.7-r4 256 -RMD160 a60fb330f3878b7573f51b2f5e213823bba5b613 files/digest-baselayout-1.12.7-r4 256 -SHA256 9fea638948b58f1ff656b3acc35f412ac3aa70279efe0fe703ff495fd1a79d5b files/digest-baselayout-1.12.7-r4 256 MD5 cc3850f4547f7dda6cb6da09e200b7a5 files/digest-baselayout-1.12.8 256 RMD160 ee4d86476675e157d2237a3611970af21d27450f files/digest-baselayout-1.12.8 256 SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/digest-baselayout-1.12.8 256 MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10 280 RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10 280 SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10 280 -MD5 8a931a7d421a3df91acb570f378fa464 files/digest-baselayout-1.13.0_alpha9-r3 277 -RMD160 e2949b9445e60b6d9902b07504b4a4c2120747c9 files/digest-baselayout-1.13.0_alpha9-r3 277 -SHA256 4c4a40b16d79de524bcec0efd55b0e0c383fc84b92937b2491074bcdab90ead9 files/digest-baselayout-1.13.0_alpha9-r3 277 diff --git a/sys-apps/baselayout/baselayout-1.12.7-r3.ebuild b/sys-apps/baselayout/baselayout-1.12.7-r3.ebuild deleted file mode 100644 index 950d9456fbd1..000000000000 --- a/sys-apps/baselayout/baselayout-1.12.7-r3.ebuild +++ /dev/null @@ -1,541 +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.12.7-r3.ebuild,v 1.2 2006/12/19 13:38:26 uberlord Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build static unicode" - -# This version of baselayout needs gawk in /bin, but as we do not have -# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" -# or "build" are in USE. -# We need to block old dhcpcd versions as they are no longer in system -# but may not be in users world file either. See bug #143885 -RDEPEND="virtual/init - !build? ( !bootstrap? ( - >=sys-libs/readline-5.0-r1 - >=app-shells/bash-3.1_p7 - >=sys-apps/coreutils-5.2.1 - ) ) - !> "${D}/usr/share/baselayout/mkdirs.sh" </dev/null \\ - || ewarn " can't create ${d}" - touch "\${ROOT}/${d}/.keep" 2>/dev/null \\ - || ewarn " can't create ${d}/.keep" -fi -EOF - else - args=("${args[@]}" "${d}") - fi - done -} - -# Continued from kdir above... This function removes any empty -# directories as a temporary workaround for bug 9849. The directories -# (and .keep files) are re-created in pkg_postinst, which means they -# aren't listed in CONTENTS, unfortunately. -unkdir() { - einfo "Running unkdir to workaround bug 9849" - find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null - if [[ $? == 127 ]]; then - ewarn "Problem running unkdir: find command not found" - fi -} - -# Same as kdir above, but for symlinks #103618 -ksym() { - echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ - >> "${D}"/usr/share/baselayout/mklinks.sh -} - -src_install() { - local dir libdirs libdirs_env rcscripts_dir - - # This directory is to stash away things that will be used in - # pkg_postinst; it's needed first for kdir to function - dodir /usr/share/baselayout - - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - # This should be /lib/rcscripts, but we have to support old profiles too. - if [[ ${SYMLINK_LIB} == "yes" ]]; then - rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" - else - rcscripts_dir="/lib/rcscripts" - fi - - einfo "Creating directories..." - kdir /usr - kdir /usr/local - kdir /boot - kdir /dev - kdir /dev/pts - kdir /dev/shm - kdir /etc/conf.d - kdir /etc/cron.daily - kdir /etc/cron.hourly - kdir /etc/cron.monthly - kdir /etc/cron.weekly - kdir /etc/env.d - dodir /etc/init.d # .keep file might mess up init.d stuff - kdir /etc/modules.autoload.d - kdir /etc/modules.d - kdir /etc/opt - kdir /home - kdir ${rcscripts_dir} - kdir ${rcscripts_dir}/awk - kdir ${rcscripts_dir}/sh - kdir ${rcscripts_dir}/net - # Only install /mnt stuff at bootstrap time #88835 / #90022 - if use build ; then - kdir /mnt - kdir -m 0700 /mnt/cdrom - kdir -m 0700 /mnt/floppy - fi - kdir /opt - kdir -o root -g uucp -m0775 /var/lock - kdir /proc - kdir -m 0700 /root - kdir /sbin - kdir /sys # for 2.6 kernels - kdir /usr/bin - kdir /usr/include - kdir /usr/include/asm - kdir /usr/include/linux - kdir /usr/local/bin - kdir /usr/local/games - kdir /usr/local/sbin - kdir /usr/local/share - kdir /usr/local/share/doc - kdir /usr/local/share/man - kdir /usr/local/src - kdir ${PORTDIR} - kdir /usr/sbin - kdir /usr/share/doc - kdir /usr/share/info - kdir /usr/share/man - kdir /usr/share/misc - kdir /usr/src - kdir -m 1777 /tmp - kdir /var - dodir /var/db/pkg # .keep file messes up Portage - kdir /var/lib/misc - kdir /var/lock/subsys - kdir /var/log/news - kdir /var/run - kdir /var/spool - kdir /var/state - kdir -m 1777 /var/tmp - - for dir in ${libdirs}; do - libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} - [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue - kdir /${dir} - kdir /usr/${dir} - kdir /usr/local/${dir} - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib - fi - - # FHS compatibility symlinks stuff - ksym /var/tmp /usr/tmp - ksym share/man /usr/local/man - - # - # Setup files in /etc - # - insopts -m0644 - insinto /etc - doins -r "${S}"/etc/* - fperms 0640 /etc/sysctl.conf - - # Install some files to /usr/share/baselayout instead of /etc to keep from - # (1) overwriting the user's settings, (2) screwing things up when - # attempting to merge files, (3) accidentally packaging up personal files - # with quickpkg - fperms 0600 /etc/shadow - mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout - - # doinitd doesnt respect symlinks - dodir /etc/init.d - cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd" - #doinitd "${S}"/init.d/* || die "doinitd" - doconfd "${S}"/etc/conf.d/* || die "doconfd" - doenvd "${S}"/etc/env.d/* || die "doenvd" - insinto /etc/modules.autoload.d - doins "${S}"/etc/modules.autoload.d/* - insinto /etc/modules.d - doins "${S}"/etc/modules.d/* - - # Special-case uglyness... For people updating from lib32 -> lib amd64 - # profiles, keep lib32 in the search path while it's around - if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - - # List all the multilib libdirs in /etc/env/04multilib (only if they're - # actually different from the normal - if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib - fi - - # As of baselayout-1.10-1-r1, sysvinit is its own package again, and - # provides the inittab itself - rm -f "${D}"/etc/inittab - - # Stash the rc-lists for use during pkg_postinst - cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release - - # - # Setup files related to /dev - # - into / - dosbin "${S}"/sbin/MAKEDEV - dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV - dosym ../sbin/MAKEDEV /dev/MAKEDEV - - # - # Setup files in /bin - # - cd "${S}"/bin - dobin rc-status - - # - # Setup files in /sbin - # - cd "${S}"/sbin - into / - dosbin rc rc-update - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - dosbin runscript.sh functions.sh - - # Compat symlinks between /etc/init.d and /sbin - # (some stuff have hardcoded paths) - dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh - dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh - dosym ../../sbin/functions.sh /etc/init.d/functions.sh - - # - # Setup files in /lib/rcscripts - # These are support files for other things in baselayout that needn't be - # under CONFIG_PROTECTed /etc - # - cd "${S}"/sbin - exeinto ${rcscripts_dir}/sh - doexe rc-services.sh rc-daemon.sh rc-help.sh - - # We can only install new, fast awk versions of scripts - # if 'build' or 'bootstrap' is not in USE. This will - # change if we have sys-apps/gawk-3.1.1-r1 or later in - # the build image ... - if ! use build; then - # This is for new depscan.sh and env-update.sh - # written in awk - cd "${S}"/sbin - into / - dosbin depscan.sh - dosbin env-update.sh - insinto ${rcscripts_dir}/awk - doins "${S}"/src/awk/*.awk - fi - - # Original design had these in /etc/net.modules.d but that is too - # problematic with CONFIG_PROTECT - dodir ${rcscripts_dir} - cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir} - chown -R root:0 ${D}${rcscripts_dir} - - # - # Install baselayout documentation - # - if ! use build ; then - doman "${S}"/man/*.* - docinto / - dodoc ${FILESDIR}/copyright - dodoc "${S}"/ChangeLog - fi - - # - # Install baselayout utilities - # - local libdir="lib" - [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") - - cd "${S}"/src - make DESTDIR="${D}" LIBDIR="${libdir}" install || die - - # Hack to fix bug 9849, continued in pkg_postinst - unkdir -} - -# Support function for remapping old wireless dns vars -remap_dns_vars() { - local f="$1" - - if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then - sed -e 's/\ ${IMAGE}/etc/conf.d/${f} - fi -} - -pkg_preinst() { - if [[ -f ${ROOT}/etc/modules.autoload && \ - ! -d ${ROOT}/etc/modules.autoload.d ]]; then - mkdir -p ${ROOT}/etc/modules.autoload.d - mv -f ${ROOT}/etc/modules.autoload \ - ${ROOT}/etc/modules.autoload.d/kernel-2.4 - ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload - fi - - # Change some vars introduced in baselayout-1.11.0 before we go stable - # The new names make more sense and allow nis_domain - # for use in baselayout-1.12.0 - remap_dns_vars net - remap_dns_vars wireless -} - -pkg_postinst() { - local x y - - # Reincarnate dirs from kdir/unkdir (hack for bug 9849) - einfo "Creating directories and .keep files." - einfo "Some of these might fail if they're read-only mounted" - einfo "filesystems, for example /dev or /proc. That's okay!" - source "${ROOT}"/usr/share/baselayout/mkdirs.sh - source "${ROOT}"/usr/share/baselayout/mklinks.sh - echo - - # Create /boot/boot symlink in pkg_postinst because sometimes - # /boot is a FAT filesystem. When that is the case, then the - # symlink will fail. Consequently, if we create it in - # src_install, then merge will fail. AFAIK there is no point to - # this symlink except for misconfigured grubs. See bug 50108 - # (05 May 2004 agriffis) - ln -sn . "${ROOT}"/boot/boot 2>/dev/null - - # Set up default runlevel symlinks - # This used to be done in src_install but required knowledge of ${ROOT}, - # which meant that it was effectively broken for binary installs. - if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then - for x in boot default nonetwork single; do - einfo "Creating default runlevel symlinks for ${x}" - mkdir -p "${ROOT}"/etc/runlevels/${x} - for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do - if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then - ewarn "init.d/${y} not found -- ignoring" - else - ln -sfn /etc/init.d/${y} \ - "${ROOT}"/etc/runlevels/${x}/${y} - fi - done - done - fi - - # Create /etc/hosts in pkg_postinst so we don't overwrite an - # existing file during bootstrap - if [[ ! -e ${ROOT}/etc/hosts ]]; then - cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly... see src_install() for why they - # are in /usr/share/baselayout/ - for x in passwd shadow group fstab ; do - if [[ -e ${ROOT}/etc/${x} ]] ; then - touch "${ROOT}/etc/${x}" - else - cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}" - fi - done - - # Under what circumstances would mtab be a symlink? It would be - # nice if there were an explanatory comment here - if [[ -L ${ROOT}/etc/mtab ]]; then - rm -f "${ROOT}/etc/mtab" - if [[ ${ROOT} == / ]]; then - cp /proc/mounts "${ROOT}/etc/mtab" - else - touch "${ROOT}/etc/mtab" - fi - fi - - # We should only install empty files if these files don't already exist. - [[ -e ${ROOT}/var/log/lastlog ]] || \ - touch "${ROOT}/var/log/lastlog" - [[ -e ${ROOT}/var/run/utmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp" - [[ -e ${ROOT}/var/log/wtmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp" - - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - # Regenerate init.d dependency tree - /sbin/depscan.sh --update &>/dev/null - else - rm -f ${ROOT}/etc/modules.conf - fi - - # This is also written in src_install (so it's in CONTENTS), but - # write it here so that the new version is immediately in the file - # (without waiting for the user to do etc-update) - rm -f ${ROOT}/etc/._cfg????_gentoo-release - echo "Gentoo Base System version ${PV}" > ${ROOT}/etc/gentoo-release - - echo - einfo "Please be sure to update all pending '._cfg*' files in /etc," - einfo "else things might break at your next reboot! You can use 'etc-update'" - einfo "to accomplish this:" - einfo - einfo " # etc-update" - echo - - for f in ${ROOT}etc/init.d/net.* ; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue - echo - einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" - einfo "They need to be converted to symlinks to net.lo. If you haven't" - einfo "made personal changes to those files, you can update with the" - einfo "following command:" - einfo - einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo" - echo - break - done - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \ - | egrep -q '\<(domain|nameservers|searchdomains)_' ; then - echo - ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net" - ewarn "or ${ROOT}/etc/conf.d/wireless" - ewarn - ewarn "domain_* -> dns_domain_*" - ewarn "nameservers_* -> dns_servers_*" - ewarn "searchdomains_* -> dns_search_domains_*" - ewarn - ewarn "They have been converted for you - ensure that you" - ewarn "update them via 'etc-update'" - echo - fi - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \ - | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then - echo - ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net" - ewarn - ewarn "You are advised to review the new configuration variables as" - ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no" - ewarn "guarantee that they will work in future versions." - echo - fi - - # Remove old stuff that may cause problems. - if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then - rm -f "${ROOT}"/etc/env.d/01hostname - fi - if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then - rm -f "${ROOT}"/etc/init.d/domainname - rm -f "${ROOT}"/etc/runlevels/*/domainname - ewarn "The domainname init script has been removed in this version." - ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" - ewarn "to apply dns/nis information to the loopback interface." - fi -} diff --git a/sys-apps/baselayout/baselayout-1.12.7-r4.ebuild b/sys-apps/baselayout/baselayout-1.12.7-r4.ebuild deleted file mode 100644 index f1959f51de23..000000000000 --- a/sys-apps/baselayout/baselayout-1.12.7-r4.ebuild +++ /dev/null @@ -1,543 +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.12.7-r4.ebuild,v 1.3 2006/12/19 13:38:26 uberlord Exp $ - -inherit flag-o-matic eutils toolchain-funcs multilib - -DESCRIPTION="Filesystem baselayout and init scripts" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2 - http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build static unicode" - -# This version of baselayout needs gawk in /bin, but as we do not have -# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" -# or "build" are in USE. -# We need to block old dhcpcd versions as they are no longer in system -# but may not be in users world file either. See bug #143885 -RDEPEND="virtual/init - !build? ( !bootstrap? ( - >=sys-libs/readline-5.0-r1 - >=app-shells/bash-3.1_p7 - >=sys-apps/coreutils-5.2.1 - ) ) - !> "${D}/usr/share/baselayout/mkdirs.sh" </dev/null \\ - || ewarn " can't create ${d}" - touch "\${ROOT}/${d}/.keep" 2>/dev/null \\ - || ewarn " can't create ${d}/.keep" -fi -EOF - else - args=("${args[@]}" "${d}") - fi - done -} - -# Continued from kdir above... This function removes any empty -# directories as a temporary workaround for bug 9849. The directories -# (and .keep files) are re-created in pkg_postinst, which means they -# aren't listed in CONTENTS, unfortunately. -unkdir() { - einfo "Running unkdir to workaround bug 9849" - find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null - if [[ $? == 127 ]]; then - ewarn "Problem running unkdir: find command not found" - fi -} - -# Same as kdir above, but for symlinks #103618 -ksym() { - echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \ - >> "${D}"/usr/share/baselayout/mklinks.sh -} - -src_install() { - local dir libdirs libdirs_env rcscripts_dir - - # This directory is to stash away things that will be used in - # pkg_postinst; it's needed first for kdir to function - dodir /usr/share/baselayout - - # Jeremy Huddleston - # For multilib, we want to make sure that all our multilibdirs exist - # and make lib even if it's not listed as one (like on amd64/ppc64 - # which sometimes has lib32/lib64 instead of lib/lib64). - # lib should NOT be a symlink to one of the other libdirs. - # Old systems with symlinks won't be affected by this change, as the - # symlinks already exist and won't get removed, but new systems will - # be setup properly. - # - # I'll be making a script to convert existing systems from symlink to - # nosymlink and putting it in /usr/portage/scripts. - libdirs=$(get_all_libdirs) - : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - - # This should be /lib/rcscripts, but we have to support old profiles too. - if [[ ${SYMLINK_LIB} == "yes" ]]; then - rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts" - else - rcscripts_dir="/lib/rcscripts" - fi - - einfo "Creating directories..." - kdir /usr - kdir /usr/local - kdir /boot - kdir /dev - kdir /dev/pts - kdir /dev/shm - kdir /etc/conf.d - kdir /etc/cron.daily - kdir /etc/cron.hourly - kdir /etc/cron.monthly - kdir /etc/cron.weekly - kdir /etc/env.d - dodir /etc/init.d # .keep file might mess up init.d stuff - kdir /etc/modules.autoload.d - kdir /etc/modules.d - kdir /etc/opt - kdir /home - kdir ${rcscripts_dir} - kdir ${rcscripts_dir}/awk - kdir ${rcscripts_dir}/sh - kdir ${rcscripts_dir}/net - # Only install /mnt stuff at bootstrap time #88835 / #90022 - if use build ; then - kdir /mnt - kdir -m 0700 /mnt/cdrom - kdir -m 0700 /mnt/floppy - fi - kdir /opt - kdir -o root -g uucp -m0775 /var/lock - kdir /proc - kdir -m 0700 /root - kdir /sbin - kdir /sys # for 2.6 kernels - kdir /usr/bin - kdir /usr/include - kdir /usr/include/asm - kdir /usr/include/linux - kdir /usr/local/bin - kdir /usr/local/games - kdir /usr/local/sbin - kdir /usr/local/share - kdir /usr/local/share/doc - kdir /usr/local/share/man - kdir /usr/local/src - kdir ${PORTDIR} - kdir /usr/sbin - kdir /usr/share/doc - kdir /usr/share/info - kdir /usr/share/man - kdir /usr/share/misc - kdir /usr/src - kdir -m 1777 /tmp - kdir /var - dodir /var/db/pkg # .keep file messes up Portage - kdir /var/lib/misc - kdir /var/lock/subsys - kdir /var/log/news - kdir /var/run - kdir /var/spool - kdir /var/state - kdir -m 1777 /var/tmp - - for dir in ${libdirs}; do - libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir} - [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue - kdir /${dir} - kdir /usr/${dir} - kdir /usr/local/${dir} - done - - # Ugly compatibility with stupid ebuilds and old profiles symlinks - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib - ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib - fi - - # FHS compatibility symlinks stuff - ksym /var/tmp /usr/tmp - ksym share/man /usr/local/man - - # - # Setup files in /etc - # - insopts -m0644 - insinto /etc - doins -r "${S}"/etc/* - fperms 0640 /etc/sysctl.conf - - # Install some files to /usr/share/baselayout instead of /etc to keep from - # (1) overwriting the user's settings, (2) screwing things up when - # attempting to merge files, (3) accidentally packaging up personal files - # with quickpkg - fperms 0600 /etc/shadow - mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout - - # doinitd doesnt respect symlinks - dodir /etc/init.d - cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd" - #doinitd "${S}"/init.d/* || die "doinitd" - doconfd "${S}"/etc/conf.d/* || die "doconfd" - doenvd "${S}"/etc/env.d/* || die "doenvd" - insinto /etc/modules.autoload.d - doins "${S}"/etc/modules.autoload.d/* - insinto /etc/modules.d - doins "${S}"/etc/modules.d/* - - # Special-case uglyness... For people updating from lib32 -> lib amd64 - # profiles, keep lib32 in the search path while it's around - if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then - libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" - fi - - # List all the multilib libdirs in /etc/env/04multilib (only if they're - # actually different from the normal - if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib - fi - - # As of baselayout-1.10-1-r1, sysvinit is its own package again, and - # provides the inittab itself - rm -f "${D}"/etc/inittab - - # Stash the rc-lists for use during pkg_postinst - cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release - - # - # Setup files related to /dev - # - into / - dosbin "${S}"/sbin/MAKEDEV - dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV - dosym ../sbin/MAKEDEV /dev/MAKEDEV - - # - # Setup files in /bin - # - cd "${S}"/bin - dobin rc-status - - # - # Setup files in /sbin - # - cd "${S}"/sbin - into / - dosbin rc rc-update - # These moved from /etc/init.d/ to /sbin to help newb systems - # from breaking - dosbin runscript.sh functions.sh - - # Compat symlinks between /etc/init.d and /sbin - # (some stuff have hardcoded paths) - dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh - dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh - dosym ../../sbin/functions.sh /etc/init.d/functions.sh - - # - # Setup files in /lib/rcscripts - # These are support files for other things in baselayout that needn't be - # under CONFIG_PROTECTed /etc - # - cd "${S}"/sbin - exeinto ${rcscripts_dir}/sh - doexe rc-services.sh rc-daemon.sh rc-help.sh - - # We can only install new, fast awk versions of scripts - # if 'build' or 'bootstrap' is not in USE. This will - # change if we have sys-apps/gawk-3.1.1-r1 or later in - # the build image ... - if ! use build; then - # This is for new depscan.sh and env-update.sh - # written in awk - cd "${S}"/sbin - into / - dosbin depscan.sh - dosbin env-update.sh - insinto ${rcscripts_dir}/awk - doins "${S}"/src/awk/*.awk - fi - - # Original design had these in /etc/net.modules.d but that is too - # problematic with CONFIG_PROTECT - dodir ${rcscripts_dir} - cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir} - chown -R root:0 ${D}${rcscripts_dir} - - # - # Install baselayout documentation - # - if ! use build ; then - doman "${S}"/man/*.* - docinto / - dodoc ${FILESDIR}/copyright - dodoc "${S}"/ChangeLog - fi - - # - # Install baselayout utilities - # - local libdir="lib" - [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") - - cd "${S}"/src - make DESTDIR="${D}" LIBDIR="${libdir}" install || die - - # Hack to fix bug 9849, continued in pkg_postinst - unkdir -} - -# Support function for remapping old wireless dns vars -remap_dns_vars() { - local f="$1" - - if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then - sed -e 's/\ ${IMAGE}/etc/conf.d/${f} - fi -} - -pkg_preinst() { - if [[ -f ${ROOT}/etc/modules.autoload && \ - ! -d ${ROOT}/etc/modules.autoload.d ]]; then - mkdir -p ${ROOT}/etc/modules.autoload.d - mv -f ${ROOT}/etc/modules.autoload \ - ${ROOT}/etc/modules.autoload.d/kernel-2.4 - ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload - fi - - # Change some vars introduced in baselayout-1.11.0 before we go stable - # The new names make more sense and allow nis_domain - # for use in baselayout-1.12.0 - remap_dns_vars net - remap_dns_vars wireless -} - -pkg_postinst() { - local x y - - # Reincarnate dirs from kdir/unkdir (hack for bug 9849) - einfo "Creating directories and .keep files." - einfo "Some of these might fail if they're read-only mounted" - einfo "filesystems, for example /dev or /proc. That's okay!" - source "${ROOT}"/usr/share/baselayout/mkdirs.sh - source "${ROOT}"/usr/share/baselayout/mklinks.sh - echo - - # Create /boot/boot symlink in pkg_postinst because sometimes - # /boot is a FAT filesystem. When that is the case, then the - # symlink will fail. Consequently, if we create it in - # src_install, then merge will fail. AFAIK there is no point to - # this symlink except for misconfigured grubs. See bug 50108 - # (05 May 2004 agriffis) - ln -sn . "${ROOT}"/boot/boot 2>/dev/null - - # Set up default runlevel symlinks - # This used to be done in src_install but required knowledge of ${ROOT}, - # which meant that it was effectively broken for binary installs. - if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then - for x in boot default nonetwork single; do - einfo "Creating default runlevel symlinks for ${x}" - mkdir -p "${ROOT}"/etc/runlevels/${x} - for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do - if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then - ewarn "init.d/${y} not found -- ignoring" - else - ln -sfn /etc/init.d/${y} \ - "${ROOT}"/etc/runlevels/${x}/${y} - fi - done - done - fi - - # Create /etc/hosts in pkg_postinst so we don't overwrite an - # existing file during bootstrap - if [[ ! -e ${ROOT}/etc/hosts ]]; then - cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc - fi - - # Touching /etc/passwd and /etc/shadow after install can be fatal, as many - # new users do not update them properly... see src_install() for why they - # are in /usr/share/baselayout/ - for x in passwd shadow group fstab ; do - if [[ -e ${ROOT}/etc/${x} ]] ; then - touch "${ROOT}/etc/${x}" - else - cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}" - fi - done - - # Under what circumstances would mtab be a symlink? It would be - # nice if there were an explanatory comment here - if [[ -L ${ROOT}/etc/mtab ]]; then - rm -f "${ROOT}/etc/mtab" - if [[ ${ROOT} == / ]]; then - cp /proc/mounts "${ROOT}/etc/mtab" - else - touch "${ROOT}/etc/mtab" - fi - fi - - # We should only install empty files if these files don't already exist. - [[ -e ${ROOT}/var/log/lastlog ]] || \ - touch "${ROOT}/var/log/lastlog" - [[ -e ${ROOT}/var/run/utmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp" - [[ -e ${ROOT}/var/log/wtmp ]] || \ - install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp" - - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then - # Regenerate init.d dependency tree - /sbin/depscan.sh --update &>/dev/null - else - rm -f ${ROOT}/etc/modules.conf - fi - - # This is also written in src_install (so it's in CONTENTS), but - # write it here so that the new version is immediately in the file - # (without waiting for the user to do etc-update) - rm -f ${ROOT}/etc/._cfg????_gentoo-release - echo "Gentoo Base System version ${PV}" > ${ROOT}/etc/gentoo-release - - echo - einfo "Please be sure to update all pending '._cfg*' files in /etc," - einfo "else things might break at your next reboot! You can use 'etc-update'" - einfo "to accomplish this:" - einfo - einfo " # etc-update" - echo - - for f in ${ROOT}etc/init.d/net.* ; do - [[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue - echo - einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/" - einfo "They need to be converted to symlinks to net.lo. If you haven't" - einfo "made personal changes to those files, you can update with the" - einfo "following command:" - einfo - einfo " /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | xargs -n1 ln -sfvn net.lo" - echo - break - done - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \ - | egrep -q '\<(domain|nameservers|searchdomains)_' ; then - echo - ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net" - ewarn "or ${ROOT}/etc/conf.d/wireless" - ewarn - ewarn "domain_* -> dns_domain_*" - ewarn "nameservers_* -> dns_servers_*" - ewarn "searchdomains_* -> dns_search_domains_*" - ewarn - ewarn "They have been converted for you - ensure that you" - ewarn "update them via 'etc-update'" - echo - fi - - if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \ - | egrep -q '\<(iface_|gateway=|ifconfig_|aliases_|broadcasts_|netmasks_|inet6_|ipaddr_|iproute_)'; then - echo - ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net" - ewarn - ewarn "You are advised to review the new configuration variables as" - ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no" - ewarn "guarantee that they will work in future versions." - echo - fi - - # Remove old stuff that may cause problems. - if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then - rm -f "${ROOT}"/etc/env.d/01hostname - fi - if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then - rm -f "${ROOT}"/etc/init.d/domainname - rm -f "${ROOT}"/etc/runlevels/*/domainname - ewarn "The domainname init script has been removed in this version." - ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" - ewarn "to apply dns/nis information to the loopback interface." - fi -} diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha9-r3.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha9-r3.ebuild deleted file mode 100644 index fe7f3e09c404..000000000000 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha9-r3.ebuild +++ /dev/null @@ -1,287 +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_alpha9-r3.ebuild,v 1.2 2006/12/19 16:27:02 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="virtual/init - !build? ( - !bootstrap? ( - >=sys-libs/readline-5.0-r1 - >=app-shells/bash-3.2_p3-r1 - 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 - - # We need to copy svcdir if upgrading - if has_version "/dev/null - 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" - - 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}" - 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'" - 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." - 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 - echo - 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 - - echo - einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING" - einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does" - einfo "each net script linked to it." - einfo "The net dependency is now satisfied by any net.* scripts in the default" - einfo "runlevel, otherwise it's the last net.* script running which includes" - einfo "${lo}. So if you need to restart a net script that is listed in the" - einfo "runlevel you are in and not restart anything that needs it then you" - einfo "will need to use the --nodeps command line option." -} - -# Handle our downgraders -# We should remove this when <1.13 has been removed from the tree -pkg_postrm() { - # Remove dir if downgrading - if has_version "/dev/null - rm -rf "${ROOT}lib/rcscripts/init.d" - ) - ewarn "You will need to re-emerge ${PN} to restore ${ROOT}etc/init.d/net.lo" - fi -} diff --git a/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch b/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch deleted file mode 100644 index 398a050a8fff..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- init.d/halt.sh (revision 2421) -+++ init.d/halt.sh (working copy) -@@ -106,6 +106,11 @@ - continue - fi - -+ # If we're using the mount (probably /usr) then don't unmount us -+ if [[ " $(fuser -m "${x}" 2>/dev/null) " == *" $$ "* ]] ; then -+ continue -+ fi -+ - if ! umount "${x}" &>/dev/null; then - # Kill processes still using this mount - /bin/fuser -s -k -9 -m "${x}" -@@ -156,9 +161,13 @@ - - for x in $(awk '{print $2}' /proc/mounts | sort -ur) ; do - x=${x//\\040/ } -- if [[ -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then -+ -+ # Do not umount these ... will be different depending on value of CDBOOT -+ if [[ ${x} != "/" \ -+ && -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then - continue - fi -+ - if [[ ${cmd} == "u" ]]; then - umount -n -r "${x}" - else diff --git a/sys-apps/baselayout/files/baselayout-1.12.7-ifconfig.patch b/sys-apps/baselayout/files/baselayout-1.12.7-ifconfig.patch deleted file mode 100644 index 25b1b1f797c8..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.12.7-ifconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/rcscripts/net/ifconfig.sh (revision 2418) -+++ lib/rcscripts/net/ifconfig.sh (working copy) -@@ -364,7 +364,7 @@ - x="-net ${x}" - elif [[ ${y} == *.*.*.*/32 ]] ; then - x="-host ${x}" -- elif [[ ${y} == *.*.*.*/* ]] ; then -+ elif [[ ${y} == *.*.*.*/* || ${y} == "default" || ${y} == "0.0.0.0" ]] ; then - x="-net ${x}" - else - # Given the lack of a netmask, we assume a host -@@ -430,12 +430,12 @@ - config=( "${config[@]//peer/pointopoint}" ) - fi - -- # Ensure that the interface is up so we can add IPv6 addresses -- interface_up "${real_iface}" -- - # Some kernels like to apply lo with an address when they are brought up - if [[ ${config[@]} == "127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255" ]]; then -- is_loopback "${iface}" && ifconfig "${iface}" 0.0.0.0 -+ if is_loopback "${real_iface}" ; then -+ ifconfig "${real_iface}" ${config[@]} -+ return 0 -+ fi - fi - - ifconfig "${iface}" ${config[@]} diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch deleted file mode 100644 index 405f3f01ad08..000000000000 --- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha9-ifconfig.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: net.BSD/ifconfig.sh -=================================================================== ---- net.BSD/ifconfig.sh (revision 2420) -+++ net.BSD/ifconfig.sh (working copy) -@@ -268,9 +268,6 @@ - config[0]="inet add ${config[0]}" - fi - -- # Ensure that the interface is up so we can add IPv6 addresses -- interface_up "${iface}" -- - # Finally add the address - ifconfig "${iface}" ${config[@]} - } -@@ -319,7 +316,8 @@ - x="-net ${x}" - elif [[ ${y} == *.*.*.*/32 ]] ; then - x="-host ${x}" -- elif [[ ${y} == *.*.*.*/* ]] ; then -+ elif [[ ${y} == *.*.*.*/* || ${y} == "0.0.0.0" \ -+ || ${y} == "default" ]] ; then - x="-net ${x}" - else - # Given the lack of a netmask, we assume a host -Index: net.Linux/ifconfig.sh -=================================================================== ---- net.Linux/ifconfig.sh (revision 2420) -+++ net.Linux/ifconfig.sh (working copy) -@@ -370,7 +370,8 @@ - x="-net ${x}" - elif [[ ${y} == *.*.*.*/32 ]] ; then - x="-host ${x}" -- elif [[ ${y} == *.*.*.*/* ]] ; then -+ elif [[ ${y} == *.*.*.*/* || ${y} == "0.0.0.0" \ -+ || ${y} == "default" ]] ; then - x="-net ${x}" - else - # Given the lack of a netmask, we assume a host diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.7-r3 b/sys-apps/baselayout/files/digest-baselayout-1.12.7-r3 deleted file mode 100644 index 091d0563a091..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.7-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c068b7a3ec199be5c96b049609d4ed82 baselayout-1.12.7.tar.bz2 221590 -RMD160 885c424cf34d2a9b2d814bad91f7902ea8182079 baselayout-1.12.7.tar.bz2 221590 -SHA256 52fddebeb156a49712e35a98de4a30fe23ee0e541b2b12d4195ed45193b735ca baselayout-1.12.7.tar.bz2 221590 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 b/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 deleted file mode 100644 index 091d0563a091..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c068b7a3ec199be5c96b049609d4ed82 baselayout-1.12.7.tar.bz2 221590 -RMD160 885c424cf34d2a9b2d814bad91f7902ea8182079 baselayout-1.12.7.tar.bz2 221590 -SHA256 52fddebeb156a49712e35a98de4a30fe23ee0e541b2b12d4195ed45193b735ca baselayout-1.12.7.tar.bz2 221590 diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha9-r3 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha9-r3 deleted file mode 100644 index e5635d48b519..000000000000 --- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha9-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 57f42558210a315cabf72d87b2403cee baselayout-1.13.0_alpha9.tar.bz2 259509 -RMD160 424a8b902fd981976994c33660fe7e54c983e566 baselayout-1.13.0_alpha9.tar.bz2 259509 -SHA256 a5727dbce99d47e27e5b28f4a71f331eb1c232a266c29065b143849cfa57ff17 baselayout-1.13.0_alpha9.tar.bz2 259509