Rename "crypt" USE flag to a more descriptive "afp", and document what the flag does. Acked by ssuominen.

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

4 files changed, 19 insertions, 16 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 8bfb67587952..b0c562e36a8b 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.154 2011/10/17 16:46:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.155 2011/10/19 05:32:29 tetromino Exp $
+
+  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
+  metadata.xml:
+  Rename "crypt" USE flag to a more descriptive "afp", and document what the
+  flag does. Acked by ssuominen.
 
   17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> gvfs-1.6.7-r1.ebuild,
   gvfs-1.10.1.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index cd327afe372c..50dd7d32f233 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 AUX gvfs-1.6.7-fix-renaming.patch 1484 RMD160 a35255f2e926ed44f41bf1ff14dbc1b50925113d SHA1 880f387bb127ae7c0346ee6114a7bd127e68c8ee SHA256 af564f4c555b1052fd88bf14798abd095920765f356549a40c56f6b791aaa5af
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
-EBUILD gvfs-1.10.1.ebuild 3024 RMD160 d8175da0370eaafce243f7eb76252f803237c9c7 SHA1 bbae84f97a56191e3bc44108df3587223b1573e8 SHA256 cc505f62683e497b8356b585a2e94839241774367e295bfcb2614c79e78173e6
+EBUILD gvfs-1.10.1.ebuild 3022 RMD160 e638faeb554ceb6a42fa58af60fec912ac34cb36 SHA1 4667bd9babe127a881f4f7fce9c03408be272428 SHA256 aa8d43be0ac8fcab2e97c4864c1f6f4386762079cfc59e271823929e9bfdc8b1
 EBUILD gvfs-1.6.7-r1.ebuild 3438 RMD160 91d3b8c32f062789ae810e775963d15e7cdda188 SHA1 7acf4556ab80a7aebc6b15ef2c18195fdb8dc9f2 SHA256 5499e15c5db2d42cf95f4162b2f4223bd2820866ca6d832bd25bd6864c063a78
 EBUILD gvfs-1.6.7.ebuild 3047 RMD160 3c3beebf0f2f45ed3d7cac469baaa2a0e7365fda SHA1 73f03e7ba9f396e3a5de559ef4086c2a610ca023 SHA256 401306541cf8173bc51e69096598af3d27fdabfff88d411e9b0009d4c6994d9d
-MISC ChangeLog 21344 RMD160 afe58ba0b18f5b69454193ea3ac3d4597d64930b SHA1 9b7a12f72652d448c00c776563c234b77ef34f26 SHA256 64f0254afd61c625b9f74ed145297810746742fd4a3c313d28fcb1295f92e23a
-MISC metadata.xml 1131 RMD160 24282f039aef6b75732c9c1ea12c7af80edd09de SHA1 840f736a4471f737fd38ca419308aefc9861d0c5 SHA256 2ecc04873e7b003b649771120252276c8641f14a0c193d082a1bf66c983d60d6
+MISC ChangeLog 21550 RMD160 169b9398b8ee90f73dafddd6a042b853c014507b SHA1 1cc6392bc66a89307efbd40552ee2049cdfc7dee SHA256 c1000a484b3cae1843b2501176cfe56e467d2b7b78675a5e13545f47d9ec0dae
+MISC metadata.xml 1231 RMD160 458e97a3b184ac6650822b3ca0f60a5feca91b43 SHA1 1024e8c290ce6bad2b45fb5603647edfc40bde1c SHA256 47924271bbe1f66b42c7265d49b1650f28c143226ffb4808b695e0a22c439213
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOnFvrAAoJEEdUh39IaPFN+UwH/jA2DWmLPlEBb/JLgVEdQ+UO
-tDDU1kYuT7pp9COiumHTE4bO1q8ZFrFC8xW0JrLKPfcF5uZ3pBDkD8Nt49FkeTRC
-paWZWZZaQORnHelmqT5q+VP6elDppSUFcG75a4vLvlYZYXzZMaqEqifNvwjyYER/
-jHs3qxKD5NXUmtBzrs5fQ+HfIGx6UU0iek+XUhJrt/QK1kJ3kziOmWszq00jmJRg
-p4SbnlmGSxbtUQMyn0siQ0xmohs3/eMrFIM/182NG8vMgjBgiSmCjMbQsXwvkZEH
-1FNmJtpxpNGiDsJ1wc6bUW5pmnv7wPk0evELC6coB4Ua/BkchX6SxLsXP8EAeC4=
-=nFAo
+iF4EAREIAAYFAk6eYPMACgkQdjK8w9WeBnBzWQD/eKn8/xGpXp+yjmr3e0PyV/Rq
+BaTunkc1i2BLxH3r270A/06qYWpRpkvp6lYP4MUoLXC6KbIvEsC0clN5In/tAuJH
+=6yXG
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index 67de10939460..8e81582f3f50 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.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/gvfs/gvfs-1.10.1.ebuild,v 1.2 2011/10/17 16:46:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.3 2011/10/19 05:32:29 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -24,13 +24,14 @@ else
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
 fi
 
-IUSE="archive avahi bluetooth bluray cdda crypt doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
 
 RDEPEND=">=dev-libs/glib-2.29.14
 	sys-apps/dbus
 	dev-libs/libxml2
 	net-misc/openssh
 	!prefix? ( >=sys-fs/udev-164-r2 )
+	afp? ( >=dev-libs/libgcrypt-1.2.2 )
 	archive? ( app-arch/libarchive )
 	avahi? ( >=net-dns/avahi-0.6 )
 	bluetooth? (
@@ -39,7 +40,6 @@ RDEPEND=">=dev-libs/glib-2.29.14
 		net-wireless/bluez
 		dev-libs/expat )
 	bluray? ( media-libs/libbluray )
-	crypt? ( dev-libs/libgcrypt )
 	fuse? ( >=sys-fs/fuse-2.8.0 )
 	gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
@@ -66,12 +66,12 @@ pkg_setup() {
 		--disable-hal
 		--disable-schemas-compile
 		--with-dbus-service-dir=/usr/share/dbus-1/services
+		$(use_enable afp)
 		$(use_enable archive)
 		$(use_enable avahi)
 		$(use_enable bluetooth obexftp)
 		$(use_enable bluray)
 		$(use_enable cdda)
-		$(use_enable crypt afp)
 		$(use_enable fuse)
 		$(use_enable gdu)
 		$(use_enable gphoto2)
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index c98b827d8e44..ae7ac08e8228 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -10,6 +10,8 @@ using the APIs of libgio. There is also fuse support that allows
 applications not using gio to access the gvfs filesystems.
 </longdescription>
 <use>
+	<flag name='afp'>Enables support for accessing AFP (Apple Filing Protocol)
+		network shares</flag>
 	<flag name='archive'>Enables support for accessing files in archives
 		transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>