ssuominen 14/04/05 10:58:32
Modified: udev-init-scripts-26-r2.ebuild ChangeLog
udev-init-scripts-9999.ebuild
Log:
Synchronize use of ROOT
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.2 sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild?r1=1.1&r2=1.2
Index: udev-init-scripts-26-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-init-scripts-26-r2.ebuild 3 Apr 2014 19:16:01 -0000 1.1
+++ udev-init-scripts-26-r2.ebuild 5 Apr 2014 10:58:31 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild,v
1.1 2014/04/03 19:16:01 ssuominen Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r2.ebuild,v
1.2 2014/04/05 10:58:31 ssuominen Exp $
EAPI=5
@@ -30,45 +30,36 @@
DEPEND="${RDEPEND}
virtual/pkgconfig"
-src_prepare()
-{
+src_prepare() {
epatch_user
}
-src_install()
-{
+src_install() {
default
# These are now part of >=net-misc/netifrc-0.2.1:
rm -f "${D}"/$(get_udevdir)/{net.sh,rules.d/90-network.rules}
}
-pkg_postinst()
-{
+pkg_postinst() {
# Add udev and udev-mount to the sysinit runlevel automatically if this
is
# the first install of this package.
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]]
- then
- mkdir -p "${ROOT}"etc/runlevels/sysinit
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
+ mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
fi
- if [[ -x "${ROOT}"etc/init.d/udev ]]
- then
- ln -s /etc/init.d/udev
"${ROOT}"/etc/runlevels/sysinit/udev
+ if [[ -x ${ROOT%/}/etc/init.d/udev ]]; then
+ ln -s /etc/init.d/udev
"${ROOT%/}"/etc/runlevels/sysinit/udev
fi
- if [[ -x "${ROOT}"etc/init.d/udev-mount ]]
- then
+ if [[ -x ${ROOT%/}/etc/init.d/udev-mount ]]; then
ln -s /etc/init.d/udev-mount \
- "${ROOT}"etc/runlevels/sysinit/udev-mount
+ "${ROOT%/}"/etc/runlevels/sysinit/udev-mount
fi
fi
# Warn the user about adding the scripts to their sysinit runlevel
- if [[ -e "${ROOT}"etc/runlevels/sysinit ]]
- then
- if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev ]]
- then
+ if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
+ if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev ]]; then
ewarn
ewarn "You need to add udev to the sysinit runlevel."
ewarn "If you do not do this,"
@@ -76,8 +67,7 @@
ewarn "Run this command:"
ewarn "\trc-update add udev sysinit"
fi
- if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
- then
+ if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev-mount ]]; then
ewarn
ewarn "You need to add udev-mount to the sysinit
runlevel."
ewarn "If you do not do this,"
1.93 sys-fs/udev-init-scripts/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.93&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?rev=1.93&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog?r1=1.92&r2=1.93
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog 3 Apr 2014 19:16:01 -0000 1.92
+++ ChangeLog 5 Apr 2014 10:58:31 -0000 1.93
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev-init-scripts
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.92
2014/04/03 19:16:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.93
2014/04/05 10:58:31 ssuominen Exp $
+
+ 05 Apr 2014; Samuli Suominen <[email protected]>
+ udev-init-scripts-26-r2.ebuild, udev-init-scripts-9999.ebuild:
+ Use ${ROOT%/} instead of ${ROOT}, synchronize coding style of 'then',
+ and remove useless quoting inside of [[ to match sys-fs/udev
*udev-init-scripts-26-r2 (03 Apr 2014)
1.28 sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.28&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?rev=1.28&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild?r1=1.27&r2=1.28
Index: udev-init-scripts-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- udev-init-scripts-9999.ebuild 3 Apr 2014 19:16:01 -0000 1.27
+++ udev-init-scripts-9999.ebuild 5 Apr 2014 10:58:31 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
1.27 2014/04/03 19:16:01 ssuominen Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v
1.28 2014/04/05 10:58:31 ssuominen Exp $
EAPI=5
@@ -29,37 +29,29 @@
!<sys-fs/udev-186"
DEPEND="${RDEPEND}"
-src_prepare()
-{
+src_prepare() {
epatch_user
}
-pkg_postinst()
-{
+pkg_postinst() {
# Add udev and udev-mount to the sysinit runlevel automatically if this
is
# the first install of this package.
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- if [[ ! -d "${ROOT}"etc/runlevels/sysinit ]]
- then
- mkdir -p "${ROOT}"etc/runlevels/sysinit
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then
+ mkdir -p "${ROOT%/}"/etc/runlevels/sysinit
fi
- if [[ -x "${ROOT}"etc/init.d/udev ]]
- then
- ln -s /etc/init.d/udev
"${ROOT}"/etc/runlevels/sysinit/udev
+ if [[ -x ${ROOT%/}/etc/init.d/udev ]]; then
+ ln -s /etc/init.d/udev
"${ROOT%/}"/etc/runlevels/sysinit/udev
fi
- if [[ -x "${ROOT}"etc/init.d/udev-mount ]]
- then
+ if [[ -x ${ROOT%/}/etc/init.d/udev-mount ]]; then
ln -s /etc/init.d/udev-mount \
- "${ROOT}"etc/runlevels/sysinit/udev-mount
+ "${ROOT%/}"/etc/runlevels/sysinit/udev-mount
fi
fi
# Warn the user about adding the scripts to their sysinit runlevel
- if [[ -e "${ROOT}"etc/runlevels/sysinit ]]
- then
- if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev ]]
- then
+ if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then
+ if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev ]]; then
ewarn
ewarn "You need to add udev to the sysinit runlevel."
ewarn "If you do not do this,"
@@ -67,8 +59,7 @@
ewarn "Run this command:"
ewarn "\trc-update add udev sysinit"
fi
- if [[ ! -e "${ROOT}"etc/runlevels/sysinit/udev-mount ]]
- then
+ if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/udev-mount ]]; then
ewarn
ewarn "You need to add udev-mount to the sysinit
runlevel."
ewarn "If you do not do this,"
