Fix sun disklabel rule

Package-Manager: portage-2.1.2.11

3 files changed, 19 insertions, 17 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index eaa9cad3c6e4..228908632c72 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.201 2007/08/01 21:42:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.202 2007/08/03 17:20:05 gustavoz Exp $
+
+  03 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  files/0.5.9/99_sun_disklabel_ignore.patch:
+  Fix sun disklabel rule
 
   01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
   files/0.5.9/24_libparted_1_8_7.patch:
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index c7b7d06ff8b9..cb738dba2b20 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -125,10 +125,10 @@ AUX 0.5.9/98_hald_cache_test_path.patch 898 RMD160 da4949adae527cee5379566602724
 MD5 5b0e12ba184d9d5049af5b2c2fb17100 files/0.5.9/98_hald_cache_test_path.patch 898
 RMD160 da4949adae527cee53795666027243161a20400e files/0.5.9/98_hald_cache_test_path.patch 898
 SHA256 dd60c1165b79301099053cf299f9b1aaea23c1a767a5494ab896590fd2a368e0 files/0.5.9/98_hald_cache_test_path.patch 898
-AUX 0.5.9/99_sun_disklabel_ignore.patch 841 RMD160 268f8ada789f6ff8dfce8dcc460af4d722655be1 SHA1 b89e57f89d12d702ae662657c3e985cd0c499f66 SHA256 16746216e574f2d257c39bea791cd6c97f4287b5666c2b041314ba5d286a923f
-MD5 716cf856265e1a6ee44e557eca6e58e4 files/0.5.9/99_sun_disklabel_ignore.patch 841
-RMD160 268f8ada789f6ff8dfce8dcc460af4d722655be1 files/0.5.9/99_sun_disklabel_ignore.patch 841
-SHA256 16746216e574f2d257c39bea791cd6c97f4287b5666c2b041314ba5d286a923f files/0.5.9/99_sun_disklabel_ignore.patch 841
+AUX 0.5.9/99_sun_disklabel_ignore.patch 737 RMD160 421f841c67ba44a174e4f064d9fe06f4395fc7f6 SHA1 22e5d4b5a46fea9b04be52ad40a38cfc8b88cbca SHA256 9f578831836ff89d3bcb7e2b24304fa083f7a95bd7b1d465a68dd6c9c3ae07de
+MD5 60dfccbfb48f45dc30cfabffb752a56c files/0.5.9/99_sun_disklabel_ignore.patch 737
+RMD160 421f841c67ba44a174e4f064d9fe06f4395fc7f6 files/0.5.9/99_sun_disklabel_ignore.patch 737
+SHA256 9f578831836ff89d3bcb7e2b24304fa083f7a95bd7b1d465a68dd6c9c3ae07de files/0.5.9/99_sun_disklabel_ignore.patch 737
 AUX 0.5.9/series 938 RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b SHA1 9d998a08e37676493386a6e0ba1e220b6ccba158 SHA256 12281e626fc5b9ee3f3b29d1233d698ad0d16e0cb7e134a89a7c3a536afaaabb
 MD5 e717cf92a61ad9ccd74e2e5500e0c0a3 files/0.5.9/series 938
 RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b files/0.5.9/series 938
@@ -236,10 +236,10 @@ EBUILD hal-0.5.9.1-r1.ebuild 7630 RMD160 a34edec7969e95119e639457699f9fc57c1b703
 MD5 e497e637a54e4175fc0a24dc039ad65a hal-0.5.9.1-r1.ebuild 7630
 RMD160 a34edec7969e95119e639457699f9fc57c1b703a hal-0.5.9.1-r1.ebuild 7630
 SHA256 661224ecace8c5e01f2e0d9c6728fbed55ce76f0847c37c147ce1e09d0994e47 hal-0.5.9.1-r1.ebuild 7630
-MISC ChangeLog 33289 RMD160 cb4330f625dbbc86b8e047ebf51f71169ad8b727 SHA1 0b599146e407b3674bfc7c0b73a1abc165dee078 SHA256 dac63c35d2a3f51e7c92878b82ac0466b53112e3ec5c5c79e1621f5fa257de5e
-MD5 0378ba5db02c6f3b114593d0af96e831 ChangeLog 33289
-RMD160 cb4330f625dbbc86b8e047ebf51f71169ad8b727 ChangeLog 33289
-SHA256 dac63c35d2a3f51e7c92878b82ac0466b53112e3ec5c5c79e1621f5fa257de5e ChangeLog 33289
+MISC ChangeLog 33416 RMD160 a078e5cafd96349fe01be7ab586ae709c22752c3 SHA1 61d4c1f62d4b92f82383470b348beaa1865f4741 SHA256 7f775f8f0176871c5d3c6239abdd364f908da0819a58f7041ae23b39986c8f8f
+MD5 fba6bfa23d20d727c0798ff494f2f877 ChangeLog 33416
+RMD160 a078e5cafd96349fe01be7ab586ae709c22752c3 ChangeLog 33416
+SHA256 7f775f8f0176871c5d3c6239abdd364f908da0819a58f7041ae23b39986c8f8f ChangeLog 33416
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -254,9 +254,9 @@ MD5 0b6b9a1ce7f87610dbda3f922db15fa9 files/digest-hal-0.5.9.1-r1 238
 RMD160 2cb1ef22b4ce904b95d1f944b9d0263a93c0f968 files/digest-hal-0.5.9.1-r1 238
 SHA256 a4b6fc77fa4c4a013240b9cb2eea17745527ec0175bd22f395733d386ae31b2b files/digest-hal-0.5.9.1-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFGsP5ZoeSe8B0zEfwRAqS0AJ0cn0uge87VV4RJLHzWjVPt3bkH8wCeJsxr
-2Q89BgstqDsE5CHuKto3dZ0=
-=Q3qw
+iD8DBQFGs2PJKRy60XGEcJIRApuOAJ0TWRVAgFY4AMOQClErThEHI3ozWQCfcvtg
+VzBkWQCz6vD0093n7Xoq4i0=
+=gw2/
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch
index 451ab4fb0abf..e03ebe59c1e6 100644
--- a/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch
+++ b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch
@@ -2,7 +2,7 @@ Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi
 ===================================================================
 --- a/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-07-27 12:26:05.000000000 -0400
 +++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-07-27 12:26:22.000000000 -0400
-@@ -16,4 +16,17 @@
+@@ -16,4 +16,15 @@
        </match>
      </match>
    </device>
@@ -12,9 +12,7 @@ Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi
 +    <match key="volume.fsusage" string="filesystem">
 +      <match key="volume.partition.number" int="3">
 +        <match key="volume.partition.start" uint64="0">
-+          <match key="@block.storage_device:storage.size" uint64="@volume.size">
-+            <merge key="volume.ignore" type="bool">true</merge>
-+          </match>
++          <merge key="volume.ignore" type="bool">true</merge>
 +        </match>
 +      </match>
 +    </match>