summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2010-11-21 17:58:49 +0000
committerWilliam Hubbs <williamh@gentoo.org>2010-11-21 17:58:49 +0000
commit59aba65500b8f8ffd0ccf6a0bdf4e1a3a22a869b (patch)
treed5e2661e8047dc59e3f2172f9b940c1276003097 /sys-apps
parentamd64/x86 stable, bug #344685 (diff)
downloadgentoo-2-59aba65500b8f8ffd0ccf6a0bdf4e1a3a22a869b.tar.gz
gentoo-2-59aba65500b8f8ffd0ccf6a0bdf4e1a3a22a869b.tar.bz2
gentoo-2-59aba65500b8f8ffd0ccf6a0bdf4e1a3a22a869b.zip
version bump and remove old versions
(Portage version: 2.2.0_alpha4/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/openrc/ChangeLog25
-rw-r--r--sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch14
-rw-r--r--sys-apps/openrc/openrc-0.6.2.ebuild411
-rw-r--r--sys-apps/openrc/openrc-0.6.5.ebuild (renamed from sys-apps/openrc/openrc-0.6.4.ebuild)2
4 files changed, 17 insertions, 435 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index aab142fe2978..cd0a445acbc7 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.120 2010/11/15 16:53:48 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.121 2010/11/21 17:58:49 williamh Exp $
+
+*openrc-0.6.5 (21 Nov 2010)
+
+ 21 Nov 2010; William Hubbs <williamh@gentoo.org> -openrc-0.6.2.ebuild,
+ -files/openrc-0.6.2-fix-make-3.82.patch, -openrc-0.6.4.ebuild,
+ +openrc-0.6.5.ebuild:
+ version bump and remove old versions
15 Nov 2010; William Hubbs <williamh@gentoo.org> -openrc-0.6.0-r1.ebuild,
-files/openrc-0.6.0-fix-bsd-compile.patch,
@@ -81,7 +88,7 @@
21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
openrc-9999.ebuild, +files/openrc-9999-pause.patch:
Restore "pause" functionality to teach people to convert #218859 by Martin
- Mokrejš.
+ Mokrejš.
21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
files/openrc-9999-msg-style.patch:
@@ -90,7 +97,7 @@
07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
openrc-9999.ebuild:
Migrate hostname by default to avoid default thrashing on conf.d/hostname
- #295406 by Martin Mokrejš. Also delay automatic dep tree update till
+ #295406 by Martin Mokrejš. Also delay automatic dep tree update till
after we are done screwing with /etc.
06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
@@ -204,7 +211,7 @@
15 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
openrc-9999.ebuild:
- Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
+ Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
*openrc-0.5.1-r1 (15 Oct 2009)
@@ -270,14 +277,14 @@
files/9999/0003-KV.patch:
Update patches against latest svn #267540 by Vivien Moreau.
- 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+ 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
files/0.4.3/0002-support-custom-status.patch:
backport r1523 and r1524 to fix compile on FreeBSD and still provide the
system status function in custom hooks
*openrc-0.4.3-r2 (18 Apr 2009)
- 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+ 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+files/0.4.3/0002-support-custom-status.patch,
-files/openrc-0.4.3-fix-is_older_than.patch,
+files/0.4.3/0001-fix-is_older_than.patch, openrc-0.4.3-r1.ebuild,
@@ -333,7 +340,7 @@
03 Jan 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
Change comment into useable tags.
- 01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+ 01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+files/0.4.0/0005-init-script-novserver.patch:
fix dmesg and sysfs init script inside vservers, bug #253105
@@ -527,7 +534,7 @@
+openrc-0.2.1-r1.ebuild:
fix bug #216091. crash when stringlist was non-existant
- 03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
+ 03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
Add ~sparc wrt #214957
02 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1.ebuild,
@@ -588,7 +595,7 @@
28 Mar 2008; Alexis Ballier <aballier@gentoo.org> openrc-0.2-r1.ebuild:
keyword ~x86-fbsd
- 28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
+ 28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
Add ~ia64 wrt #214957
27 Mar 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2-r1.ebuild:
diff --git a/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch b/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch
deleted file mode 100644
index 56bea9a2683c..000000000000
--- a/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pkgconfig/Makefile b/pkgconfig/Makefile
-index cdcf8be..4bf28cf 100644
---- a/pkgconfig/Makefile
-+++ b/pkgconfig/Makefile
-@@ -2,7 +2,8 @@ DIR= ${LIBDIR}/pkgconfig
- SRCS= einfo.pc.in openrc.pc.in
- INC= einfo.pc openrc.pc
-
--sed -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h
-+.DEFAULT:
-+ ${SED} -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h
-
- SED_EXTRA= -e 's:@VERSION@:${VERSION}:g'
-
diff --git a/sys-apps/openrc/openrc-0.6.2.ebuild b/sys-apps/openrc/openrc-0.6.2.ebuild
deleted file mode 100644
index 4e9cebd17eaf..000000000000
--- a/sys-apps/openrc/openrc-0.6.2.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.2.ebuild,v 1.3 2010/08/22 20:10:43 anarchy Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
- inherit git
- KEYWORDS=""
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
- kernel_FreeBSD? ( sys-process/fuser-bsd )
- elibc_glibc? ( >=sys-libs/glibc-2.5 )
- ncurses? ( sys-libs/ncurses )
- pam? ( virtual/pam )
- >=sys-apps/baselayout-2.0.0
- kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 )
- !<sys-fs/udev-133
- !<sys-apps/sysvinit-2.86-r11"
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-make_args() {
- unset LIBDIR #266688
-
- MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
- MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
-
- local brand="Unknown"
- if use kernel_linux ; then
- MAKE_ARGS="${MAKE_ARGS} OS=Linux"
- brand="Linux"
- elif use kernel_FreeBSD ; then
- MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
- brand="FreeBSD"
- fi
- export BRANDING="Gentoo ${brand}"
-}
-
-pkg_setup() {
- export DEBUG=$(usev debug)
- export MKPAM=$(usev pam)
- export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git_src_unpack
- else
- unpack ${A}
- fi
-
- cd "${S}"
- sed -i 's:0444:0644:' mk/sys.mk
- sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
- sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
-
- epatch "${FILESDIR}/${PN}-0.6.2-fix-make-3.82.patch" #333461
-
- # Allow user patches to be applied without modifying the ebuild
- epatch_user
-}
-
-src_compile() {
- make_args
-
- if [[ ${PV} == "9999" ]] ; then
- local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
- sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk
- fi
-
- tc-export CC AR RANLIB
- emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
- local file="${D}/$1" var=$2 val com
- eval "${@:5}" && val=$3 || val=$4
- [[ ${val} == "#" ]] && com="#" && val='\2'
- sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-set_config_yes_no() {
- set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
- make_args
- emake ${MAKE_ARGS} DESTDIR="${D}" install || die
-
- # install the readme for the new network scripts
- dodoc README.net
-
- # move the shared libs back to /usr so ldscript can install
- # more of a minimal set of files
- # disabled for now due to #270646
- #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
- #gen_usr_ldscript -a einfo rc
- gen_usr_ldscript libeinfo.so
- gen_usr_ldscript librc.so
-
- keepdir /$(get_libdir)/rc/{init.d,tmp}
-
- # Backup our default runlevels
- dodir /usr/share/"${PN}"
- cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
- rm -rf "${D}"/etc/runlevels
-
- # Stick with "old" net as the default for now
- doconfd conf.d/net || die
- pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null
- rm -f network staticroute
- ln -s /etc/init.d/net.lo net.lo
- popd > /dev/null
-
- # Setup unicode defaults for silly unicode users
- set_config_yes_no /etc/rc.conf unicode use unicode
-
- # Cater to the norm
- set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
- # Support for logfile rotation
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/openrc.logrotate openrc
-}
-
-add_boot_init() {
- local initd=$1
- local runlevel=${2:-boot}
- # if the initscript is not going to be installed and is not
- # currently installed, return
- [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
- || return
- [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
-
- # if runlevels dont exist just yet, then create it but still flag
- # to pkg_postinst that it needs real setup #277323
- if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/${runlevel}
- touch "${ROOT}"/etc/runlevels/.add_boot_init.created
- fi
-
- elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
- ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
- local config=$1 initd=$2
- if [[ -e ${ROOT}${config} ]] ; then
- if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
- add_boot_init ${initd}
- fi
- fi
-}
-
-pkg_preinst() {
- local f LIBDIR=$(get_libdir)
-
- # default net script is just comments, so no point in biting people
- # in the ass by accident. we save in preinst so that the package
- # manager doesnt go throwing etc-update crap at us -- postinst is
- # too late to prevent that. this behavior also lets us keep the
- # file in the CONTENTS for binary packages.
- [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
-
- # avoid default thrashing in conf.d files when possible #295406
- if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
- (
- unset hostname HOSTNAME
- source "${ROOT}"/etc/conf.d/hostname
- : ${hostname:=${HOSTNAME}}
- [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
- )
- fi
-
- # upgrade timezone file ... do it before moving clock
- if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
- (
- unset TIMEZONE
- source "${ROOT}"/etc/conf.d/clock
- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
- )
- fi
-
- # /etc/conf.d/clock moved to /etc/conf.d/hwclock
- local clock
- use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
- if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
- mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
- fi
- if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
- rm -f "${ROOT}"/etc/init.d/clock
- fi
- if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
- rm -f "${ROOT}"/etc/runlevels/boot/clock
- ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
- fi
- if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
- rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
- ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
- fi
-
- # /etc/conf.d/rc is no longer used for configuration
- if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
- elog "/etc/conf.d/rc is no longer used for configuration."
- elog "Please migrate your settings to /etc/rc.conf as applicable"
- elog "and delete /etc/conf.d/rc"
- fi
-
- # force net init.d scripts into symlinks
- for f in "${ROOT}"/etc/init.d/net.* ; do
- [[ -e ${f} ]] || continue # catch net.* not matching anything
- [[ ${f} == */net.lo ]] && continue # real file now
- [[ ${f} == *.openrc.bak ]] && continue
- if [[ ! -L ${f} ]] ; then
- elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
- elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
- mv "${f}" "${f}.openrc.bak"
- ln -snf net.lo "${f}"
- fi
- done
-
- # termencoding was added in 0.2.1 and needed in boot
- has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
- # set default interactive shell to sulogin if it exists
- set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
- has_version sys-apps/openrc || migrate_from_baselayout_1
- has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
-}
-
-# >=openrc-0.4.0 no longer loads the udev addon
-migrate_udev_init_script() {
- # make sure udev is in sysinit if it was enabled before
- local enable_udev=false
- local rc_devices=$(
- [[ -f /etc/rc.conf ]] && source /etc/rc.conf
- [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
- echo "${rc_devices:-${RC_DEVICES:-auto}}"
- )
- case ${rc_devices} in
- udev|auto)
- enable_udev=true
- ;;
- esac
-
- if $enable_udev; then
- add_boot_init udev sysinit
- add_boot_init udev-postmount default
- fi
-}
-
-migrate_from_baselayout_1() {
- # baselayout boot init scripts have been split out
- for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
- # baselayout-1 is always "old" net, so ignore "new" net
- [[ ${f} == "network" ]] && continue
-
- add_boot_init ${f}
- done
-
- # Try to auto-add some addons when possible
- add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
- add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
- add_boot_init_mit_config /etc/mdadm.conf mdraid
- add_boot_init_mit_config /etc/evms.conf evms
- [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
- [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
- elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
- elog "init.d scripts. If you use such a thing, make sure you have the"
- elog "required init.d scripts added to your boot runlevel."
-
- # Upgrade out state for baselayout-1 users
- if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
- (
- [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
- svcdir=${svcdir:-/var/lib/init.d}
- if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
- ewarn "No state found, and no state exists"
- elog "You should reboot this host"
- else
- mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
- einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
- mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
- rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
- "${ROOT}${LIBDIR}"/rc/init.d/console
- umount "${ROOT}${svcdir}" 2>/dev/null
- rm -rf "${ROOT}${svcdir}"
- fi
- )
- fi
-
- # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
- elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
- rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
- local f v
- for f in "${ROOT}"/etc/modules.autoload.d/* ; do
- v=${f##*/}
- v=${v#kernel-}
- v=${v//[^[:alnum:]]/_}
- gawk -v v="${v}" -v f="${f##*/}" '
- BEGIN { print "\n### START: Auto-converted from " f "\n" }
- {
- if ($0 ~ /^[^#]/) {
- print "modules_" v "=\"${modules_" v "} " $1 "\""
- gsub(/[^[:alnum:]]/, "_", $1)
- printf "module_" $1 "_args_" v "=\""
- for (i = 2; i <= NF; ++i) {
- if (i > 2)
- printf " "
- printf $i
- }
- print "\"\n"
- } else
- print
- }
- END { print "\n### END: Auto-converted from " f "\n" }
- ' "${f}" >> "${D}"/etc/conf.d/modules
- done
- rm -f "${f}"
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
- fi
- fi
-}
-
-pkg_postinst() {
- local LIBDIR=$(get_libdir)
-
- # Remove old baselayout links
- rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
-
- # Make our runlevels if they don't exist
- if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
- einfo "Copying across default runlevels"
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
- rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
- else
- if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/sysinit
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
- "${ROOT}"/etc/runlevels/sysinit
- fi
- if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/shutdown
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
- "${ROOT}"/etc/runlevels/shutdown
- fi
- fi
-
- # /etc/conf.d/net.example is no longer valid
- local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
- local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
- if [[ -e "${NET_EXAMPLE}" ]] ; then
- if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
- rm -f "${NET_EXAMPLE}"
- elog "${NET_EXAMPLE} has been removed."
- else
- sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
- elog "${NET_EXAMPLE} should be removed."
- fi
- elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example"
- fi
-
- # /etc/conf.d/wireless.example is no longer valid
- local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
- local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
- if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
- if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
- rm -f "${WIRELESS_EXAMPLE}"
- elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
- else
- sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
- elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
- fi
- elog "If you are using the old style network scripts,"
- elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
- elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
- fi
-
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
- ewarn "/etc/modules.autoload.d is no longer used. Please convert"
- ewarn "your files to /etc/conf.d/modules and delete the directory."
- fi
-
- # update the dependency tree after touching all files #224171
- [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
- elog "You should now update all files in /etc, using etc-update"
- elog "or equivalent before restarting any services or this host."
- elog
- elog "Please read the migration guide available at:"
- elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
-}
diff --git a/sys-apps/openrc/openrc-0.6.4.ebuild b/sys-apps/openrc/openrc-0.6.5.ebuild
index b7d55d76c78a..9ab683c7fcb2 100644
--- a/sys-apps/openrc/openrc-0.6.4.ebuild
+++ b/sys-apps/openrc/openrc-0.6.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.4.ebuild,v 1.1 2010/11/15 16:37:57 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.5.ebuild,v 1.1 2010/11/21 17:58:49 williamh Exp $
EAPI="1"