Use updated scripts instead of patching them.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 13 insertions, 31 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/Manifest b/sys-fs/udev/Manifest
index 5fd43ee5652e..ecf354219e75 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -81,7 +81,6 @@ AUX udev-124-netlink-owner-check.patch 1162 RMD160 420a22a2762930479df5c7b609931
 AUX udev-141-remove-devfs-names.diff 557 RMD160 c8dbcb0dcc815d78b9f33a6b49290cf21f2b7eee SHA1 5167dc1227e2f07664fad66a24365af192c8ab14 SHA256 9d1d64b41a6ff423fb218a36c56cbdec2d79827741060f39aed2f8ce2d03693f
 AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf0399ecf326dc5f975719c SHA1 379bdb522edc45a9d9ed748be84f9087bee5b438 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371
 AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c
-AUX udev-164-remove-noopenvz.patch 483 RMD160 c0a366f657dc8bdce0e89e9b4b512c0bd11bdebc SHA1 8c40719ccd73d79de8af91c285d76494df5ee9c7 SHA256 f7da7718a5d3b8bd2fc5e4b9ed0fda36869381eb4c49316b1ba014062abb2469
 AUX udev-164-remove-v4l1.patch 1263 RMD160 6fac54e8ef9810c57065f730e3fcacb0a47f9143 SHA1 491bdba9b141acff68b9cd18b65055d9f7f41b54 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
@@ -112,6 +111,7 @@ DIST udev-151.tar.bz2 509815 RMD160 4faf310f72df791fae7f579e57964ba9ab705638 SHA
 DIST udev-162.tar.bz2 547687 RMD160 eae0acab1053ce71d6adaecea4539c70c981cc6b SHA1 fca52717a09502b093a7c5f4ecc98a735e52c982 SHA256 dc1534fe1713e28fcf3c89b20cfeee027b8d74dfed1ccd98761cc86cc818becc
 DIST udev-163.tar.bz2 556941 RMD160 d554e158d9a05737c1b86f2b49399904dea9fc50 SHA1 a8232bbb3d59344b99a142db1178bdb0d8490fa3 SHA256 a17dcf856726fcbd56bf6b2c65623448008d5f81fb3edf2807ec5471fdea9ae9
 DIST udev-164.tar.bz2 557126 RMD160 f169b21c955f96554b8c7af1fd174037e60dfe12 SHA1 ef6c6c707c249246f6d848f6a0a545bff8d903cf SHA256 81db1a089e4c13fd73fbb5ace7974ab84e2d92d8a39fad81d3707d92b6429258
+DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
 DIST udev-gentoo-scripts-164.tar.bz2 9506 RMD160 d1eea1660c3c760acf75bfcd72b4e1c0b2c53be3 SHA1 e79e677590f1b1574718d3c019a80c12e9267a5a SHA256 2c23fdfe0f509e1248fec2287af6f638e86393f7c848240cb34ab4d082492d8d
 EBUILD udev-114.ebuild 9052 RMD160 9ef38d7955abbc8942f51988008df9ef1f7bf2c3 SHA1 fba81373aa4e84d4438ee23e75cfc8a7e9a2c6ac SHA256 1e23c9f029f9714cca50a21d055d5db2b0037a124a8032dd3c8f4e92a5ec8141
 EBUILD udev-115-r1.ebuild 10129 RMD160 2d7e75a63c032d72ac0c8ec815ac6bf4e3b3ecec SHA1 9dfa2d251bf8cb8927d859b47069b00ff2ae2c5f SHA256 7bddf951ef73f44bc6248938fe0b19d3557a903a38a85eae799491f1f48d94a4
@@ -126,15 +126,15 @@ EBUILD udev-151-r4.ebuild 16818 RMD160 6bcd9aaf66b17006cc0b530e19b7a9f018a14239
 EBUILD udev-162.ebuild 16011 RMD160 ae2acf58a16ee3834883ead2b11c535ef3664909 SHA1 a70f08516ef780f10c2c500b6fc3253d54b4ec7d SHA256 cc656960f29040db9dba06595d426940e0c38fa991d0060dc876585c2870ddc0
 EBUILD udev-163.ebuild 16011 RMD160 12b78ea7ccc807bfe64e0bb1f24146b212f26ae1 SHA1 0c2e2f96bbdecf84e20f8d65092e239467f025cc SHA256 c31e77a7cfcd2d3ed8ed11e6b7d05c8204dfe9179720ded6f552317f639f2446
 EBUILD udev-164-r1.ebuild 15002 RMD160 23fe6e9dc462772a1f15dc96c952c656c9dc1ace SHA1 8ec0967b86eb7656c3bcdd742be69b0071047281 SHA256 f6c241d7782f44043bcb5c4dc04631a1b7528b63884ab5c9a4a3460657a64144
-EBUILD udev-164-r2.ebuild 15136 RMD160 8249863c90d690e08857eb4745ce502b331902d4 SHA1 f4838658734242a94dfc247a67b75e0f41d727fc SHA256 1aa3e9355b662891e3dccae1201e09fddcd6ce3307a713d5637fba9726d9c65a
+EBUILD udev-164-r2.ebuild 15086 RMD160 e64f0da7415b9afcf4b049c9685398daf5946edb SHA1 25adf0e866043f5dfdd89dbc85f6e4d46cd9fcfe SHA256 07ecae00280d931cbc3ff0b5ec093df6b93e94fe1575e871e9589e5c6a2101cd
 EBUILD udev-164.ebuild 16342 RMD160 c94222337e34fa88b87e96058b9400790e55c2eb SHA1 1b9c0fa7e81f6d8d0945248bf70e744f2dad321d SHA256 cd8fd341209d2a216d6053124d28108a3cce8651e9093b686a7b2305cb97f7e8
 EBUILD udev-9999.ebuild 15906 RMD160 eccb13d05abc0f7d53952a57fc8307310424b08a SHA1 0a85ac5886c0cb5bbc48b777b898b53c3d41e458 SHA256 71baec39e758add66fd8adedea72df90af659f1a7369c8bca0b94ad53ae43a7d
-MISC ChangeLog 116810 RMD160 04db39b7583bf2bc682d28cb97d408842c81cf63 SHA1 2cc5ae3b335168f275844b35135562706e0b8a74 SHA256 dbc44a0475fb88fa19d3de55027d3762ad6b81ed4a77c0d0033b6d119aaa82ff
+MISC ChangeLog 116973 RMD160 47f64469afc3dc201af805e12ede76c1944d2d23 SHA1 44417bfacd403ea05b885bad077e4f821c65c6ec SHA256 efa9a62858593d0d08559a4fc2ad256b4a04c54ae422f63173f60f605f8c8901
 MISC metadata.xml 502 RMD160 f353faee03dd5920d1f7d65c123d93e018c7be53 SHA1 02c5eb9fd660e69127fa84487e0d70b85ee1d3cc SHA256 ca6a239a7be7949fdf1461eb524ca9234a0fd2aee9fc7eeb758a2347b6031664
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2EjgMACgkQt2vP6XvVdOe2oACbB2DA2kibrozxhwz+qxF7facI
-/hQAoJFVoGdOdTGzJ6bU2LSrtUKZrFMP
-=QhMS
+iEYEARECAAYFAk2TflUACgkQt2vP6XvVdOd6MACePSjC+/RK+eLf57g9BafnrEhi
+T04An2kNQgkHlFcsKdawJtprtWVsnXRN
+=Iacc
 -----END PGP SIGNATURE-----
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}"