summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2011-03-30 19:03:22 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2011-03-30 19:03:22 +0000
commit96b980be37ccdd21ddf6066c0993d71199c31ad6 (patch)
tree9cbca98a41ba8ca259aafcdf64bf8fdc3583cf2b /sys-fs/udev
parentCall die(). (diff)
downloadgentoo-2-96b980be37ccdd21ddf6066c0993d71199c31ad6.tar.gz
gentoo-2-96b980be37ccdd21ddf6066c0993d71199c31ad6.tar.bz2
gentoo-2-96b980be37ccdd21ddf6066c0993d71199c31ad6.zip
Use updated scripts instead of patching them.
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/udev')
-rw-r--r--sys-fs/udev/ChangeLog6
-rw-r--r--sys-fs/udev/files/udev-164-remove-noopenvz.patch21
-rw-r--r--sys-fs/udev/udev-164-r2.ebuild5
3 files changed, 7 insertions, 25 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index dd000b432ad5..80d824a0c1bf 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.565 2011/03/19 11:06:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.566 2011/03/30 19:03:22 zzam Exp $
+
+ 30 Mar 2011; Matthias Schwarzott <zzam@gentoo.org> udev-164-r2.ebuild,
+ -files/udev-164-remove-noopenvz.patch:
+ Use updated scripts instead of patching them.
*udev-164-r2 (19 Mar 2011)
diff --git a/sys-fs/udev/files/udev-164-remove-noopenvz.patch b/sys-fs/udev/files/udev-164-remove-noopenvz.patch
deleted file mode 100644
index 66b3676247d4..000000000000
--- a/sys-fs/udev/files/udev-164-remove-noopenvz.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 4f62b490427d4643e49b84610f4da916b14177c0
-Author: Matthias Schwarzott <zzam@gentoo.org>
-Date: Sat Mar 19 11:14:36 2011 +0100
-
- initd: Remove noopenvz from init-script.
-
- Bug #346885
-
-diff --git a/rc/openrc/udev b/rc/openrc/udev
-index 23fc39c..88a4a42 100644
---- a/rc/openrc/udev
-+++ b/rc/openrc/udev
-@@ -23,7 +23,7 @@ depend()
- before checkfs fsck
-
- # udev does not work inside vservers
-- keyword novserver nolxc noopenvz
-+ keyword novserver nolxc
- fi
- }
-
diff --git a/sys-fs/udev/udev-164-r2.ebuild b/sys-fs/udev/udev-164-r2.ebuild
index 1b2da5a5688d..427272345cb2 100644
--- a/sys-fs/udev/udev-164-r2.ebuild
+++ b/sys-fs/udev/udev-164-r2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.1 2011/03/19 11:06:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.2 2011/03/30 19:03:22 zzam Exp $
EAPI="1"
inherit eutils flag-o-matic multilib toolchain-funcs linux-info
#PATCHSET=${P}-gentoo-patchset-v1
-scriptversion=164
+scriptversion=164-v2
scriptname=${PN}-gentoo-scripts-${scriptversion}
if [[ ${PV} == "9999" ]]; then
@@ -147,7 +147,6 @@ src_unpack() {
fi
cd "${WORKDIR}/${scriptname}"
- epatch "${FILESDIR}/udev-164-remove-noopenvz.patch"
cd "${S}"