diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.0.0_rc4.ebuild | 272 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4 | 3 |
4 files changed, 294 insertions, 5 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index be5a5c2bdae4..ca4fa4ea7b5c 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.434 2007/08/28 20:32:53 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.435 2007/09/02 13:16:21 uberlord Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog +*baselayout-2.0.0_rc4 (02 Sep 2007) + + 02 Sep 2007; Roy Marples <uberlord@gentoo.org> + +baselayout-2.0.0_rc4.ebuild: + Bumpage + 28 Aug 2007; Markus Rothe <corsair@gentoo.org> baselayout-2.0.0_rc3-r1.ebuild: Adding ~ppc diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 8b46b1eadc8a..76aa3ca12ef6 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -36,6 +36,7 @@ DIST baselayout-2.0.0_alpha4.tar.bz2 135316 RMD160 9404971a51dcc83f8f7da153908e0 DIST baselayout-2.0.0_rc1.tar.bz2 136379 RMD160 03b39a777d59009766374f80062c8766105743b6 SHA1 f26c39e0c6cb1ab9649ea0d1a5841bf8b9d2de70 SHA256 d46d4d635f8ef14028deb4cafa543988fce336c19cddc449debfd969b731d07a DIST baselayout-2.0.0_rc2.tar.bz2 135882 RMD160 8d8e6f457c522803406f29df71db4dfd63635a95 SHA1 edc86306ff1b73d2ad17f3003161ca65226bd304 SHA256 f65e245d47bad75949e0edfa9c4b0a0992aa43f9e0cd572146c48a3c1f47138d DIST baselayout-2.0.0_rc3.tar.bz2 136734 RMD160 d1b1c78197a8e429e369628ef72aef3bc444f7ab SHA1 8278b7206650678714b13915ec847e801ad3282d SHA256 36dd8065b09f34b91a7ff9b90baa4c98e9f3480d261a81dacf5495c5c58751ed +DIST baselayout-2.0.0_rc4.tar.bz2 137154 RMD160 d257f6a6340ea46f56e3e975b096e9a2133ba27b SHA1 8f73a0ccb17bba13be8408f0803260cda376025c SHA256 2c00b8141d6188eec223484453508efceb12afa3a1427994ca823eb594746a92 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a EBUILD baselayout-1.11.15-r3.ebuild 18811 RMD160 53374dd4f21d0cec96852c5a346a5f791ad9e3a8 SHA1 722ec91ba2dbe8b80d5c1194d779e1d3450dc7d9 SHA256 427b2761578b65293daa82a81d8a4163c8ab11b540df2cd5f98f397f1b864b49 MD5 bdc7d2ba0408e6f80f62464f3c87d32a baselayout-1.11.15-r3.ebuild 18811 @@ -77,10 +78,14 @@ EBUILD baselayout-2.0.0_rc3.ebuild 9416 RMD160 39f86f42a6db64743a616e1f11904646d MD5 2b5ecbafd96c10f639ed751c6223f248 baselayout-2.0.0_rc3.ebuild 9416 RMD160 39f86f42a6db64743a616e1f11904646d2262bc6 baselayout-2.0.0_rc3.ebuild 9416 SHA256 cefa3e39f5de82411a52993eb46e1e43753eb5bb9236ed352a9fdfbaf6ae30e0 baselayout-2.0.0_rc3.ebuild 9416 -MISC ChangeLog 96078 RMD160 cf04bda6ebdc27cc7e5422d0688c35a2dc655047 SHA1 8f6bf3412b4f37efcb3241b7d38a805808f66668 SHA256 62841e70f0d72f3e178b505a79f00ff09f970b6f745c0183421eb5dad1bbffc5 -MD5 dadcb81fe69156bd24c288afa03241a7 ChangeLog 96078 -RMD160 cf04bda6ebdc27cc7e5422d0688c35a2dc655047 ChangeLog 96078 -SHA256 62841e70f0d72f3e178b505a79f00ff09f970b6f745c0183421eb5dad1bbffc5 ChangeLog 96078 +EBUILD baselayout-2.0.0_rc4.ebuild 9429 RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c SHA1 ca8b9322fc6058f5bc4b5f21deeff90f2f647cbe SHA256 cf636dcc354e5441a5177d22cdb75506da85a19e95fe4a0199384381e31a5c40 +MD5 e75516cf74b7293aca1b250ca3f678de baselayout-2.0.0_rc4.ebuild 9429 +RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c baselayout-2.0.0_rc4.ebuild 9429 +SHA256 cf636dcc354e5441a5177d22cdb75506da85a19e95fe4a0199384381e31a5c40 baselayout-2.0.0_rc4.ebuild 9429 +MISC ChangeLog 96208 RMD160 15183c6432c8a78258abd25e16e3b4feb5a6e6a6 SHA1 fc1720308d99a9712a8c1ea325b73af1d9cc6c25 SHA256 550c5be191f11598420f38e17e4ea3cda5d034b4877533f226baf2eee82b0129 +MD5 cf90a9ee52788291933516d6e8fb00eb ChangeLog 96208 +RMD160 15183c6432c8a78258abd25e16e3b4feb5a6e6a6 ChangeLog 96208 +SHA256 550c5be191f11598420f38e17e4ea3cda5d034b4877533f226baf2eee82b0129 ChangeLog 96208 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -115,3 +120,6 @@ SHA256 d93a71d08f004198383da6a900d7334d8e9e30ec6c49991954fddd9a3825f646 files/di MD5 c439f8e64ba84f87850a0558be731d05 files/digest-baselayout-2.0.0_rc3-r1 265 RMD160 23afe8848ca500bac755c1d4774ae71d815e9472 files/digest-baselayout-2.0.0_rc3-r1 265 SHA256 d93a71d08f004198383da6a900d7334d8e9e30ec6c49991954fddd9a3825f646 files/digest-baselayout-2.0.0_rc3-r1 265 +MD5 f1d98e9596ba0fa2c88bc6c2b5d9d3a5 files/digest-baselayout-2.0.0_rc4 265 +RMD160 285c61e9e4a33c9b6fa99e53f003466825089553 files/digest-baselayout-2.0.0_rc4 265 +SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/digest-baselayout-2.0.0_rc4 265 diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc4.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc4.ebuild new file mode 100644 index 000000000000..e3824138aa5b --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.0.0_rc4.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc4.ebuild,v 1.1 2007/09/02 13:16:21 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + !build? ( + !bootstrap? ( + kernel_linux? ( >=sys-apps/coreutils-5.2.1 ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + ) + ) + pam? ( virtual/pam ) + !<net-misc/dhcpcd-2.0.0" +DEPEND="virtual/os-headers" +PDEPEND="virtual/init + !build? ( !bootstrap? ( + kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev ) + ) )" + +PROVIDE="virtual/baselayout" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Setup unicode defaults for silly unicode users + if use unicode ; then + sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf + fi +} + +make_opts() { + local libdir="lib" + [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}") + local opts="${opts} LIB=${libdir}" + + if use kernel_linux ; then + opts="${opts} OS=Linux" + else + opts="${opts} OS=BSD" + fi + use pam && opts="${opts} HAVE_PAM=1" + + echo "${opts}" +} + +src_compile() { + use static && append-ldflags -static + emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die +} + +# Support function for remapping old wireless dns vars +remap_dns_vars() { + if [[ -f "${ROOT}/etc/conf.d/$1" ]]; then + sed -e 's/\<domain_/dns_domain_/g' \ + -e 's/\<mac_domain_/mac_dns_domain_/g' \ + -e 's/\<nameservers_/dns_servers_/g' \ + -e 's/\<mac_nameservers_/mac_dns_servers_/g' \ + -e 's/\<searchdomains_/dns_search_domains_/g' \ + -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \ + "${ROOT}/etc/conf.d/$1" > "${D}/etc/conf.d/$1" + fi +} + +pkg_preinst() { + # Move our makefiles to a temporay location + mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}" + + # 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 + local libdirs="$(get_all_libdirs)" dir= + # Create our multilib dirs - the Makefile has no knowledge of this + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + for dir in ${libdirs}; do + mkdir -p "${ROOT}${dir}" + touch "${ROOT}${dir}"/.keep + mkdir -p "${ROOT}usr/${dir}" + touch "${ROOT}usr/${dir}"/.keep + mkdir -p "${ROOT}usr/local/${dir}" + touch "${ROOT}usr/local/${dir}"/.keep + done + + # Ugly compatibility with stupid ebuilds and old profiles symlinks + if [[ ${SYMLINK_LIB} == "yes" ]] ; then + rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null + local lib=$(get_abi_LIBDIR ${DEFAULT_ABI}) + ln -s "${lib}" "${ROOT}lib" + ln -s "${lib}" "${ROOT}usr/lib" + ln -s "${lib}" "${ROOT}usr/local/lib" + fi + + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem" + 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() { + emake $(make_opts) DESTDIR="${D}" install || die + 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= dir= + : ${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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then + libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" + fi + echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib + doenvd "${T}"/04multilib + fi + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${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() { + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}etc/runlevels ]] ; then + einfo "Making default runlevels" + make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null + 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 "<sys-apps/${PN}-1.13.0_alpha" ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d" + cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d + rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console} + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + ) + elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then + # The format has changed since 1.13 + rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console} + fi + + if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then + /$(get_libdir)/rcscripts/bin/rc-depend --update + 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 release ${PF}" > "${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} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && 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 deprecated 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 "that no longer work" + ewarn + ewarn "You are advised to review the new configuration variables as" + ewarn "found in ${ROOT}etc/conf.d/net.example" + 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 +} + +# 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 "<sys-apps/${PN}-1.13.0_alpha" ; then + ( + source "${ROOT}etc/conf.d/rc" + svcdir="${svcdir:-/var/lib/init.d}" + einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}" + mkdir -p "${ROOT}${svcdir}" + cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}" + rm -rf "${ROOT}${svcdir}"/daemons + umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null + rm -rf "${ROOT}lib/rcscripts/init.d" + ) + fi +} diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4 new file mode 100644 index 000000000000..1d845a540da0 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc4 @@ -0,0 +1,3 @@ +MD5 d65dfec9aedd3a30a762e2c88f1e9291 baselayout-2.0.0_rc4.tar.bz2 137154 +RMD160 d257f6a6340ea46f56e3e975b096e9a2133ba27b baselayout-2.0.0_rc4.tar.bz2 137154 +SHA256 2c00b8141d6188eec223484453508efceb12afa3a1427994ca823eb594746a92 baselayout-2.0.0_rc4.tar.bz2 137154 |