Backport some patches. Fixes CD-RW blanking due to bad ATA commands, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556635

Package-Manager: portage-2.2_rc51/cvs/Linux i686

3 files changed, 26 insertions, 10 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index cb028148be37..1e0106a3ba6e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.510 2009/11/23 20:47:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.511 2009/11/24 09:01:06 zzam Exp $
+
+*udev-147-r1 (24 Nov 2009)
+
+  24 Nov 2009; Matthias Schwarzott <zzam@gentoo.org> -udev-147.ebuild,
+  +udev-147-r1.ebuild:
+  Backport some patches. Fixes CD-RW blanking due to bad ATA commands,
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556635
 
   23 Nov 2009; Markus Meier <maekke@gentoo.org> udev-146-r1.ebuild:
   arm stable, bug #286074
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 81addf1c36e9..2630695f6109 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -62,6 +62,7 @@ DIST udev-145-gentoo-patchset.tar.bz2 8765 RMD160 93bc0a8dbe220311931ff2a25dba60
 DIST udev-145.tar.bz2 529739 RMD160 7291e0d75fe2278a6820c7cc671e8757d209ec52 SHA1 bb4a557de1fcef2cbeefea8b8e7cb7938bb54760 SHA256 3bfae3386345b0650a30e35f071f2c830425d64eaf6ed4b113a8b463cd5db1fe
 DIST udev-146-gentoo-patchset-v1.tar.bz2 8370 RMD160 f6efbaa10ea0ae143bec4935e28c30df5342cbb0 SHA1 ad0995abc31daef5b8e843ba712fdca084e11bcc SHA256 d89845257847c34c9e617c5c64c686902833343dd617401d1ac196cd0589c95c
 DIST udev-146.tar.bz2 531445 RMD160 78077a918385f94dd36656d206899a089b9ceab4 SHA1 befdcfe5833e3905497a246fd1f91734cfa80ced SHA256 6c20e1980d62638e139da04c0d591bf9a96ae279a755f9dd40fb0eea918a0fa5
+DIST udev-147-gentoo-patchset-v1.tar.bz2 2056 RMD160 d7ee9e4f46e009be995fa62192a620ddc498e653 SHA1 7606e18957de1a14f8d9de5253af9967b8d0b88c SHA256 4fbfe443bb89eb32a6bff144aa819cdb50792e762966ab5ff0cbf16036ce946d
 DIST udev-147.tar.bz2 539979 RMD160 6b33fe8a491d8a5650e0bbe77ca64361ec43758d SHA1 ab6a629b719158fe342d1fb3a787a68e457fa230 SHA256 6517acde28bf319fc52c2b65fef7ef9f35a62bd669bbda6ad65de354d74d8d6b
 EBUILD udev-114.ebuild 9053 RMD160 71cf9942c2680b37cde18fb1e6b45661863add68 SHA1 a61fd58682ed8e206468f15f35c718a838f6b2c7 SHA256 fa7bf704f3406c70bc55e1e9c9995d487266707d3c93e9ea7c44844e9fbee493
 EBUILD udev-115-r1.ebuild 10130 RMD160 499b32c67f89eca774a1335b00e1c067747d453a SHA1 93ebcd32a7e1a10409464fed8e23e1bd3e8a6d24 SHA256 ce4c791c230e3430783efc180da8dce72104f337660690f8df0f90c4e37496aa
@@ -77,14 +78,14 @@ EBUILD udev-145.ebuild 13607 RMD160 b0895ed911a6d6c4d45d14364e8c11259f52a463 SHA
 EBUILD udev-146-r1.ebuild 15406 RMD160 864cac5cee25cf279687f368b9c22b9bd96b6007 SHA1 1be4c3e63c04360bd0205e885aa3482b5157481a SHA256 6c1784be04222f718b3b8166726b32d087bd0850974f0ce98bb848614559131d
 EBUILD udev-146-r2.ebuild 16310 RMD160 3c74cbbc9c076a5e8797b269ee797dcfdce03d94 SHA1 76d6fee77603a8ab0d414cc7d244cdd819cdcd95 SHA256 de610da25c4e8cb5efedc8311359f203b43ac68d685bc9aa2f0e4c13dc2e5677
 EBUILD udev-146.ebuild 15340 RMD160 c8d21097010f25b86c50cd128a2e1267e99a362e SHA1 f5952c3d427f3ecc5743c1f182e59436adbf4a49 SHA256 f9dc772c66c3ff290eac75d3d95e57ff195cc31a418f818ecbc371171097d3bd
-EBUILD udev-147.ebuild 16231 RMD160 b32df66fd43f882a7f3b946d9aab5ed7938c396c SHA1 68e07bcb35112aa5fdf3f4d17d49e5893e9dc44d SHA256 32103c6038eaa8e6e651ef02fb074e674fb72db886751862dad4632fa4407652
+EBUILD udev-147-r1.ebuild 16428 RMD160 a6c314a37b81c4ddcd927a55e67dd4f2cec1cbb3 SHA1 927aebbfe720cce4bbbf95838d253f4c4f13152a SHA256 9ef1ae73cbc716e1ca98877727caf8c11422304d7b900dadc6a07e26e4944111
 EBUILD udev-9999.ebuild 16157 RMD160 2909ebabb03d9625d5101c0463dce8260a304f77 SHA1 1f5b98d269cf3d92b2044ff38f94126dbdfa8c10 SHA256 c5c3d92cb5f588650672d013685c970e60e65e1b9623c0d7e7f3a3570bf68dec
-MISC ChangeLog 104396 RMD160 25b23dddd41bd444a41da29dcd3aeef2adab6739 SHA1 74ae9a2536c36af13aa0e096d37b13f3d8cf8aa8 SHA256 3912ff401ea3a581271630cf5d2b024c238ec0d622cc98d7cd9deabd6f924e93
+MISC ChangeLog 104646 RMD160 712833b4ca76b9052028f7e32d410cbdd8076324 SHA1 265c00dfb71f5cfb1d370c035f1aaab8b3c113fd SHA256 6e798ebc4d5c9df9891bcd14902e12127c5bfd6e8bd564143e3519e730e87db7
 MISC metadata.xml 402 RMD160 fad8844286866f47eadb2fd958f54f650976fe2a SHA1 c966d4e9e509d399523d1ba6ef54277e750334de SHA256 1c524286463bf115615462e9504c27710331f1d82a0828de5d78686f5e303ed5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksK9QwACgkQkKaRLQcq0GJX+gCgruzJPMSVKkXoFMrn/q2KUjKf
-t8MAnjiptAGMC5BDSeR91yV/iLTXqxG9
-=Q+Pb
+iEYEARECAAYFAksLoNkACgkQt2vP6XvVdOfrMACfXwpagm/a+kdquiIgXAWPnMe/
+45UAoNHDgQ43FWJFtZpnPdOcncxskivN
+=Sdl9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-147.ebuild b/sys-fs/udev/udev-147-r1.ebuild
index 9d434b94a80e..15e56508be4e 100644
--- a/sys-fs/udev/udev-147.ebuild
+++ b/sys-fs/udev/udev-147-r1.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147.ebuild,v 1.4 2009/11/19 08:17:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-147-r1.ebuild,v 1.1 2009/11/24 09:01:06 zzam Exp $
 
 EAPI="1"
 
 inherit eutils flag-o-matic multilib toolchain-funcs linux-info
 
+PATCHSET=${P}-gentoo-patchset-v1
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
 	EGIT_BRANCH="master"
 	inherit git autotools
 else
-	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+			mirror://gentoo/${PATCHSET}.tar.bz2"
 fi
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -132,6 +135,11 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+
+	# backport some patches
+	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+	        EPATCH_FORCE="yes" epatch
+
 	if ! use devfs-compat; then
 		# see Bug #269359
 		epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
@@ -147,7 +155,7 @@ src_unpack() {
 		# (more for my own needs than anything else ...)
 		MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
 		MD5=${MD5/  -/}
-		if [[ ${MD5} != 8afa8fc0fc71ada547792b5b2a608e4f ]]
+		if [[ ${MD5} != f38d3e1344588b6e44746097e1dfd149 ]]
 		then
 			echo
 			eerror "50-udev-default.rules has been updated, please validate!"