diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2007-08-17 23:46:18 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-08-17 23:46:18 +0000 |
commit | bd96e77baa34a26f207c88468140ac21c8039d7b (patch) | |
tree | 3030f2ba5aae80162a08b980139e0f0bfe511cb6 | |
parent | Revert the blocker. Just want to have it in udev-ebuild. (diff) | |
download | gentoo-2-bd96e77baa34a26f207c88468140ac21c8039d7b.tar.gz gentoo-2-bd96e77baa34a26f207c88468140ac21c8039d7b.tar.bz2 gentoo-2-bd96e77baa34a26f207c88468140ac21c8039d7b.zip |
Added blocker suggested in bug 189227, removed other hacks to keep the file. I wanted to avoid this, but it seems blockers work better these days. And if not, I don't get the bug, but portage-team ;)
(Portage version: 2.1.3.6)
-rw-r--r-- | sys-fs/udev/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/udev/udev-114-r1.ebuild | 13 | ||||
-rw-r--r-- | sys-fs/udev/udev-114.ebuild | 13 |
3 files changed, 13 insertions, 21 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index fbe7ec50a34b..f515bc5ee439 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.332 2007/08/17 23:14:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.333 2007/08/17 23:46:18 zzam Exp $ + + 17 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> udev-114.ebuild, + udev-114-r1.ebuild: + Added blocker suggested in bug 189227, removed other hacks to keep the file. + I wanted to avoid this, but it seems blockers work better these days. And if + not, I don't get the bug, but portage-team ;) 17 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> Manifest: Fixed manifest diff --git a/sys-fs/udev/udev-114-r1.ebuild b/sys-fs/udev/udev-114-r1.ebuild index 2a9344643bda..aa75667bb758 100644 --- a/sys-fs/udev/udev-114-r1.ebuild +++ b/sys-fs/udev/udev-114-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r1.ebuild,v 1.2 2007/08/17 20:04:09 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114-r1.ebuild,v 1.3 2007/08/17 23:46:18 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs linux-info @@ -14,7 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="selinux" DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" +RDEPEND="!sys-apps/coldplug + !<sys-fs/device-mapper-1.02.19-r1" RDEPEND="${DEPEND} ${RDEPEND} >=sys-apps/baselayout-1.12.5" # We need the lib/rcscripts/addon support @@ -221,14 +222,6 @@ pkg_preinst() { then coldplug_stale="1" fi - - if has_version "<sys-fs/udev-113" && - [[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] && - has_version sys-fs/device-mapper - then - # change mtime AND CONTENT to definitely keep the file - echo >> "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules - fi } pkg_postinst() { diff --git a/sys-fs/udev/udev-114.ebuild b/sys-fs/udev/udev-114.ebuild index f5bef8f8adb5..62c262a78a4e 100644 --- a/sys-fs/udev/udev-114.ebuild +++ b/sys-fs/udev/udev-114.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114.ebuild,v 1.7 2007/08/17 20:04:08 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-114.ebuild,v 1.8 2007/08/17 23:46:17 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -14,7 +14,8 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x8 IUSE="selinux" DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" +RDEPEND="!sys-apps/coldplug + !<sys-fs/device-mapper-1.02.19-r1" RDEPEND="${DEPEND} ${RDEPEND} >=sys-apps/baselayout-1.12.5" # We need the lib/rcscripts/addon support @@ -213,14 +214,6 @@ pkg_preinst() { then coldplug_stale="1" fi - - if has_version "<sys-fs/udev-113" && - [[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] && - has_version sys-fs/device-mapper - then - # change mtime AND CONTENT to definitely keep the file - echo >> "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules - fi } pkg_postinst() { |