fix for mounting things that already have a line in fstab. fixes #137211. combine all previous patches into 1 patch from upstream cvs.

(Portage version: 2.1.1_pre1-r1)
 (Unsigned Manifest commit)

1 files changed, 21 insertions, 20 deletions

diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index 0ad9d98e3895..e786162fdedf 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -1,28 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gnome-mount-0.4-fix-segv-on-no-media.patch 2028 RMD160 20a53ba84af5cd6434b702b80a6ed306820a5311 SHA1 a696b92642108e00bbc23f1e8cf6810961361f7b SHA256 1f55612af18786a7a9275765ab2c6bd4ea3f47654b6c5c890607833af0ff3197 size 2028
+AUX gnome-mount-0.4-fix-segv-on-no-media.patch 2028 RMD160 20a53ba84af5cd6434b702b80a6ed306820a5311 SHA1 a696b92642108e00bbc23f1e8cf6810961361f7b SHA256 1f55612af18786a7a9275765ab2c6bd4ea3f47654b6c5c890607833af0ff3197
 MD5 513dc3798c037e4d3ddf19ec0fb2b8fe files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028
 RMD160 20a53ba84af5cd6434b702b80a6ed306820a5311 files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028
 SHA256 1f55612af18786a7a9275765ab2c6bd4ea3f47654b6c5c890607833af0ff3197 files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028
-AUX gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 SHA1 91d5e00d8138be5a9be0b4585f8535e236b29f05 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13 size 564
+AUX gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 SHA1 91d5e00d8138be5a9be0b4585f8535e236b29f05 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13
 MD5 cbbc2b9e3b351a389b877bbb0423e34b files/gnome-mount-0.4-hal-mountable.patch 564
 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 files/gnome-mount-0.4-hal-mountable.patch 564
 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13 files/gnome-mount-0.4-hal-mountable.patch 564
-DIST gnome-mount-0.4.tar.gz 364546 RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 size 364546
-EBUILD gnome-mount-0.4-r2.ebuild 928 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 SHA1 4fc2ef3fd3cd2a149322cb060d81058e3a34a630 SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267 size 928
+AUX gnome-mount-hal-no-media-fstab.patch 15854 RMD160 53fc945ecca7fb7ba7a3805002e23b4abc160351 SHA1 23259c23fc95fe7c77671b9b69e88dacb2538b7e SHA256 49fe069d1fc5ebe16cb4f6929c457ae459056195f242891e20bb05e3b9fc91f8
+MD5 7a04f8633da7884e72aaf1016bc8ca96 files/gnome-mount-hal-no-media-fstab.patch 15854
+RMD160 53fc945ecca7fb7ba7a3805002e23b4abc160351 files/gnome-mount-hal-no-media-fstab.patch 15854
+SHA256 49fe069d1fc5ebe16cb4f6929c457ae459056195f242891e20bb05e3b9fc91f8 files/gnome-mount-hal-no-media-fstab.patch 15854
+DIST gnome-mount-0.4.tar.gz 364546 RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be SHA1 35df047b54a2dbbaa5e297396b880472679af085 SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8
+EBUILD gnome-mount-0.4-r2.ebuild 928 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 SHA1 4fc2ef3fd3cd2a149322cb060d81058e3a34a630 SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267
 MD5 8bd044bdf0d00887e0e3da13fa6bf382 gnome-mount-0.4-r2.ebuild 928
 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 gnome-mount-0.4-r2.ebuild 928
 SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267 gnome-mount-0.4-r2.ebuild 928
-EBUILD gnome-mount-0.4-r3.ebuild 1006 RMD160 18fbfc9cb5ca2aebad3121c96977fc48ff37a2ec SHA1 5be9b2625575fdecb4b2302f532b0117eda88573 SHA256 c962d298d89b3b454eabe45d585f19ee05762c615178aa05123e6ec50a4ef6ee size 1006
+EBUILD gnome-mount-0.4-r3.ebuild 1006 RMD160 18fbfc9cb5ca2aebad3121c96977fc48ff37a2ec SHA1 5be9b2625575fdecb4b2302f532b0117eda88573 SHA256 c962d298d89b3b454eabe45d585f19ee05762c615178aa05123e6ec50a4ef6ee
 MD5 e831f937604f12e534659b5a07a36b48 gnome-mount-0.4-r3.ebuild 1006
 RMD160 18fbfc9cb5ca2aebad3121c96977fc48ff37a2ec gnome-mount-0.4-r3.ebuild 1006
 SHA256 c962d298d89b3b454eabe45d585f19ee05762c615178aa05123e6ec50a4ef6ee gnome-mount-0.4-r3.ebuild 1006
-MISC ChangeLog 1632 RMD160 e2b3f4189b127ceeab3f0f29377cf53c34b0257a SHA1 bc6590169cdee039caa65d9165cebe3e635b0e63 SHA256 ea38f851de84a41f12fdf7d83158abe2032a387dea29e79f1b1ecec50282587f size 1632
-MD5 aad9f2d20a5e25cbd94df45827abd194 ChangeLog 1632
-RMD160 e2b3f4189b127ceeab3f0f29377cf53c34b0257a ChangeLog 1632
-SHA256 ea38f851de84a41f12fdf7d83158abe2032a387dea29e79f1b1ecec50282587f ChangeLog 1632
-MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193 size 206
+EBUILD gnome-mount-0.4-r4.ebuild 962 RMD160 bb225889cc86d82834d72f3dbd22b67ab2489c2b SHA1 29c03e022a3d7918bd5b1ba8f73a1eca828d05aa SHA256 aa1d9ea3f34ba3fe002b787b52d2616ce62300853d4652a20c738bb68d47e1f4
+MD5 3aeab6c45eb68644526bd583a6c3031a gnome-mount-0.4-r4.ebuild 962
+RMD160 bb225889cc86d82834d72f3dbd22b67ab2489c2b gnome-mount-0.4-r4.ebuild 962
+SHA256 aa1d9ea3f34ba3fe002b787b52d2616ce62300853d4652a20c738bb68d47e1f4 gnome-mount-0.4-r4.ebuild 962
+MISC ChangeLog 1943 RMD160 73abff8e4033a0a8526254e392e3b5723f1514f0 SHA1 fb5a0c907920bcbf497ae6da2cf3313742ee3ae1 SHA256 f4efdb31c5e88163bfb51c88886fbbe963e2271b138e7dac5b3ca193ca839368
+MD5 52dce13a588f3ab13f1fa2a983c70584 ChangeLog 1943
+RMD160 73abff8e4033a0a8526254e392e3b5723f1514f0 ChangeLog 1943
+SHA256 f4efdb31c5e88163bfb51c88886fbbe963e2271b138e7dac5b3ca193ca839368 ChangeLog 1943
+MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193
 MD5 8f804bac2d3835f24ed9a73034f969a1 metadata.xml 206
 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 metadata.xml 206
 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193 metadata.xml 206
@@ -32,10 +37,6 @@ SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/di
 MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r3 247
 RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r3 247
 SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r3 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEcPmlomPajV0RnrERAlFhAJoDSx5cwS4qng2pPWCIlZsU9HLxaQCfXgta
-d9T+OuL5lWsO0QEaJN8URqk=
-=xIYJ
------END PGP SIGNATURE-----
+MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r4 247
+RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r4 247
+SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r4 247