Modernize the fcaps() error message; thanks to Steev Klimaszewski for noticing.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 24 insertions, 17 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 7724e9ef332f..6d4c95f616bb 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.215 2011/11/17 06:09:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.216 2011/11/18 03:40:54 tetromino Exp $
+
+  18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild:
+  Modernize the fcaps() error message; thanks to Steev Klimaszewski for
+  noticing.
 
 *gnome-keyring-3.2.2 (17 Nov 2011)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index f28ab7c40f5a..8598303729c0 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -7,14 +7,14 @@ DIST gnome-keyring-3.2.1.tar.xz 1580488 RMD160 76d657a926efa077f3303251bd872dbb1
 DIST gnome-keyring-3.2.2.tar.xz 1579860 RMD160 190391c13d2a988801c023c0293bb56953901f3f SHA1 5b4a7868266d11855dea8aa488b730a4eaec3838 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2053 RMD160 bfdd0a71b05622ad2c407aa607a669699adedb9a SHA1 60711dc3e2fcfbc425e0710dfc72ce38045d58fa SHA256 c4cccc5d479c700893913dc7601757dbfa0499c149c6739ae9511e5dca9660ff
 EBUILD gnome-keyring-2.32.1.ebuild 1977 RMD160 030a2705ce3022ca94e224a29eb5c10e42cc14c8 SHA1 220870dfcd9b733277925629184c16891ef437b7 SHA256 87e5e15e57d3212bb7cd84f79cf3519461e68dcb416a1abfb4e83de6f654c587
-EBUILD gnome-keyring-3.2.1.ebuild 3146 RMD160 4c3cf4720d467f6934bc62e2a97acfd50ae8dda9 SHA1 28f5a705948cb62972e848738518dc60438bb25f SHA256 94648b3595ed703084558c244bd282494f74a349fd927997a65fb12b2108d786
-EBUILD gnome-keyring-3.2.2.ebuild 3158 RMD160 73dbf81ec432cb7e86f0ac5eac9359afe61c1d92 SHA1 69eb880c545de0b810eb9362360974c97bd8049c SHA256 b7dbcf80cc93a0bf66ecf0a3d6632a0dabaca7df771cde6825ff230def8d9e8a
-MISC ChangeLog 30415 RMD160 61e82342bbee86bd520a4fd593b5671890a360f6 SHA1 a435f9b91533dcb5f8acabe676cf7ba6f8c2f499 SHA256 b5be12aad0e43938a944aa980f06928183645f5e9f94074cd92110875a5a35aa
+EBUILD gnome-keyring-3.2.1.ebuild 3228 RMD160 c937448aef5ebee64fd2cd2140a6e3bfe99745e6 SHA1 ae30181947f7574c42cdbf0624321d02d592bab9 SHA256 e9acd5230695c75595587073c42fd3d2c03ee26b20a7e15ee8f8bad1d49e14c9
+EBUILD gnome-keyring-3.2.2.ebuild 3240 RMD160 d40ebecd2cc9f090089abf7cdb366b26e426f3de SHA1 5b7e696aa44220de5cda9b2b627562733e280f0d SHA256 1c0f5b118294fa0393b9c872de809dd5a644703cc08bd4bb0e16a9360ba7ca85
+MISC ChangeLog 30617 RMD160 3a42648a780a1b0179f8fc9bd5de776ff9c51593 SHA1 446159eef2ccb83bbd1b5fe6e9c36e3a4e3e5ba5 SHA256 4182c5c4f86adc7dacf377522e1e08579a1d2210afdd79e98d5e5db3c9b685b1
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7EpRcACgkQdjK8w9WeBnDVvwD9GU1fQbYql8gWsCPxYoPXzoTk
-u+ze1JQ4ReZNqmUypXgBALHOK5mKoszISrlyQDb/k3yVye1JUUx+sKuDQKTAYyVZ
-=+p7T
+iF4EAREIAAYFAk7F08wACgkQdjK8w9WeBnAfcgD/c5YSLRyhhu1ncrZmJCMjVKST
+3qrdnzX9ttzJGsxuT34A/1cDCnPWNtN0HweJUalZWx/jc3zRpvCplFSsKAu29FvD
+=RIri
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
index 49e3c820fb5d..f2e7fcca6119 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.1 2011/10/30 07:21:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.2 2011/11/18 03:40:54 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -101,10 +101,11 @@ fcaps() {
 	res=$?
 
 	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
+		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+		ewarn "where <FS> is the filesystem to store ${path}"
+		ewarn "If you are using kernel 2.6.32 or older, you will also need to enable"
+		ewarn "SECURITY_FILE_CAPABILITIES."
 		ewarn
 		ewarn "Falling back to suid now..."
 		chmod u+s ${path}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
index 70d49ea4de08..83e9113166db 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:09:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.2 2011/11/18 03:40:54 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -103,10 +103,11 @@ fcaps() {
 	res=$?
 
 	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
+		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+		ewarn "where <FS> is the filesystem to store ${path}"
+		ewarn "If you are using kernel 2.6.32 or older, you will also need to enable"
+		ewarn "SECURITY_FILE_CAPABILITIES."
 		ewarn
 		ewarn "Falling back to suid now..."
 		chmod u+s ${path}