summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-03-28 18:57:01 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-03-28 18:57:01 +0000
commit5ca7a0a15a3aa222740ce0865df7476e2dbb703d (patch)
tree1e689feb973bc64ae9de15db60f37cbcccf7f4f3 /sys-fs
parentFix building with uClibc and missing (or incompatible) locale_t, thanks to Mi... (diff)
downloadgentoo-2-5ca7a0a15a3aa222740ce0865df7476e2dbb703d.tar.gz
gentoo-2-5ca7a0a15a3aa222740ce0865df7476e2dbb703d.tar.bz2
gentoo-2-5ca7a0a15a3aa222740ce0865df7476e2dbb703d.zip
masked warning re udev-postmount removal when sys-fs/eudev[rule-generator] is installed, bug 492574
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev-init-scripts/ChangeLog8
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild5
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild5
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild5
4 files changed, 16 insertions, 7 deletions
diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index 29ab427c4ca6..158ba5aa7151 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,12 @@
# 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.88 2014/03/05 20:39:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.89 2014/03/28 18:57:01 axs Exp $
+
+ 28 Mar 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ udev-init-scripts-26-r1.ebuild, udev-init-scripts-26.ebuild,
+ udev-init-scripts-9999.ebuild:
+ masked warning re udev-postmount removal when sys-fs/eudev[rule-generator] is
+ installed, bug 492574
05 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
udev-init-scripts-9999.ebuild:
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
index 28f5ba3cc05b..6e30b4a3407c 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild
@@ -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-r1.ebuild,v 1.1 2014/03/05 18:59:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26-r1.ebuild,v 1.2 2014/03/28 18:57:01 axs Exp $
EAPI=5
@@ -84,7 +84,8 @@ pkg_postinst()
fi
fi
- if [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+ if ! has_version "sys-fs/eudev[rule-generator]" && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
ewarn "The udev-postmount service has been removed because the reasons for"
ewarn "its existance have been removed upstream."
ewarn "Please remove it from your runlevels."
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
index b6d6e26c6082..b6b318a50660 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild
@@ -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.ebuild,v 1.16 2014/03/05 18:59:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-26.ebuild,v 1.17 2014/03/28 18:57:01 axs Exp $
EAPI=5
@@ -80,7 +80,8 @@ pkg_postinst()
fi
fi
- if [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+ if ! has_version "sys-fs/eudev[rule-generator]" && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
ewarn "The udev-postmount service has been removed because the reasons for"
ewarn "its existance have been removed upstream."
ewarn "Please remove it from your runlevels."
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 245515a94e13..78634c657655 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -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.23 2014/03/05 20:39:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.24 2014/03/28 18:57:01 axs Exp $
EAPI=5
@@ -75,7 +75,8 @@ pkg_postinst()
fi
fi
- if [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+ if ! has_version "sys-fs/eudev[rule-generator]" && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
ewarn "The udev-postmount service has been removed because the reasons for"
ewarn "its existance have been removed upstream."
ewarn "Please remove it from your runlevels."