Rename IUSE="crypt" with IUSE="cryptsetup" and require USE="udev" where appropiate wrt #475770 by "Ronald"

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 34 insertions, 25 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 75a23ea9b798..1e2f0de39952 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.143 2013/05/01 12:18:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.144 2013/07/18 10:36:41 ssuominen Exp $
+
+  18 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-2.1.0.ebuild,
+  metadata.xml:
+  Rename IUSE="crypt" with IUSE="cryptsetup" and require USE="udev" where
+  appropiate wrt #475770 by "Ronald"
 
   01 May 2013; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.0.4-r4.ebuild,
   -udisks-2.0.91.ebuild:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 92e2aa624b33..556fce8ec113 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -10,17 +10,17 @@ AUX udisks-2.1.0-ieee1394.patch 1094 SHA256 603e30c8f6c632385a7b77d609a55805a998
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-2.1.0.tar.bz2 823805 SHA256 310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 SHA512 dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811 WHIRLPOOL a891e1fed94b6c516a31b291ae4bfcfb8764df51f93781a6da4b1aa4051b7164ddb5ba7d28067dd4418c756af3056dddabc952f531c4d78c8ff60e7ce305835a
 EBUILD udisks-1.0.4-r5.ebuild 2684 SHA256 b2b33fbe2af220d225672cde8be87a5fff54529cc5f2b2beaab019d2a3729ef5 SHA512 aac6e2010a6773024abf33da2dc64e373c2ca652c42794e983695b9f709bf827dd820e6f7bb91b5a84fc37599c0a42cf2e89cce04794a6fb7a75115925f7e07a WHIRLPOOL 448d9e260beaadfc929059b93273a8035e5777425e7ee87a976e4f959d835a2865ce0edda4cbc1853356b8cdd887f3af8da490c91b9c13f0e3f5aedb106bcb09
-EBUILD udisks-2.1.0.ebuild 2985 SHA256 97aba19b43ab4b64affd479447a4b5c5b623fb03f8bc38af2cd23bc7985ffc36 SHA512 4bb8c2c5448a84f9110ab7dc8eca57e15ac776c085ac588bbdb3eca7a4d8da4c834fc3491aa8a80bdab468e4ce53736d42cd27aeb715ed4029ae258309a47208 WHIRLPOOL 02ed99eddb885189ccf22021dca44bee90f4da1340e15d5462522ac389aef1059872da1574b7cdf8e251042ef7df12c4caad52accbbef99718ce2e7e7c222455
-MISC ChangeLog 20585 SHA256 4b4126c091779452deb2b01d0e1ce5ad7f75abfcb5469cc5ab3faea062e8dc94 SHA512 4e24adc7a27ad98ae28f6c311fe31339dbc660cd11fdea02428da14369f2158268f17ffa203097b579a6d1eeb0ebfa2ef5d67667a9d41c0b86f0ef8e38df15e4 WHIRLPOOL 207972297083c1c678d1b0a0662c24509054eecff18017d155b056c34b4fee17078d5aa0206f892c49bdd8cba1ddd17ab9f880f3890e0e1b33f34be37574a457
-MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
+EBUILD udisks-2.1.0.ebuild 3037 SHA256 1845ae66b10d9cb604e7bb2cd640090034518672e25f7a437d9f964d0e15c1ea SHA512 24f9673bac5366625ed887673232bd6f42f1c84e157ad45a1deaad8a59c7b68df7225a274d4593a0af766ef41851ec6ff4a69a2e1dd950ec4100193ca54c97df WHIRLPOOL 24644687fcc149701294e535e82de02589bff5cab66491dc63580431c260321994349a6b4ad2d96467c323710b24a14b3c8cd6bd5c392c9c1c847fd67e0c2ea0
+MISC ChangeLog 20788 SHA256 a497296ddd8d8f4e48bcee2ce9f22107159b2d751565828ad37dd1280cf1fe11 SHA512 20c1a62a50ada3a5751096ca63e66a3266bae3276ba33912ad4b3e540bfaff5d7b3740241a685e32f185fc0231efab5ae29615e17efc085281b641aa3677917b WHIRLPOOL 10706d46bf64d7d059c5e651dc0af0a16e8fc459068849cf2b661850ef0d97ab767e59442774b9908fe997d7252cc55eae83de3f707a572e78297d7a74741675
+MISC metadata.xml 735 SHA256 372e32cc56ba43aafbed3fd11af19e74b7b50ea70886d6f10440c7f8ae477c26 SHA512 f55fbe68bfb02178b310b5d455cb04527b255237771809457cea65ca0a8249415e59ff76d5bdac9f402cbb0707ea8cf4d711abb6fc874878ac2107ac070cdccb WHIRLPOOL aea1509c3f0a0d22b803d2382ebf382402c8573d9580abf0598283155b95ad8537a6c5735595db262f8036a73447e642226e26bcea0b826456f6cd396845e6f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgQeSAAoJEEdUh39IaPFNChIH/jEUfu3oNG5w/E2gIWPDVMwA
-ndCimBxGtWgbRe/S/GH2FlwXy5RdLzteTEOp1m4NwuzRU+dDHjAOHajZ2zSi8OLC
-t7Z+/q8Ml+UHjX/K14Ji0XCaUykPYEJVxmEZrfjKHSalQK3YBr0i07XklEyA9oi7
-wFfAJAqaoq8cFXzZuz6+umlwVw3bcHwuKQB/8hp2rz5H0LN0REBveF/loZ5rF6nC
-1DwSwteNqyrb3v2dfVO5UhCntxwYWlkwRsPMOlSzRo6eEVWSWib35KyRayZ0Izsc
-hifqnwX5FWPBGbb55a4FI2+WKJFTBYWqYvkw+p6gxT2KIk/xaw+RYfv/+2Ai0sM=
-=PyaC
+iQEcBAEBCAAGBQJR58UnAAoJEEdUh39IaPFNEKcH/i2cYo8cf4CizRoWQmO0Sju9
+IOoOdO7oJr+PmUiQTk6IWCNc5SnXcwpP5X7c0bFEyXYGphSkk3iajoYkVdCyMkIt
+uBEFFkSRx2CV/98PD7o42h5m/6adUPEG2lHAX7MpKXygwuEmyJdRzGizyhEnhIHg
+6OxWMZ6J4O7pDlahVo3+cNryIH+cqy5voKls8ficVyCIxzKNfqhT2d3oVoHtTAfE
+deZkbv17FnHBDz324yqj4n52z3x33+cOr3DNHzln6KkpCnKjjZ1k6hcryHWX2cZu
+PI9HNBLlX/S6gNofcizV+VJPCHzCr401MtbupdDZoBEabFt1WSzNFTsMesKD0rs=
+=0UaT
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b3e9582453ce..f6f88f4bc4b8 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
-  <maintainer>
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name='gptfdisk'>Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
-    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-    <flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
-    <flag name='systemd'>Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
-  </use>
+	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='cryptsetup'>Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
+		<flag name='gptfdisk'>Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+		<flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+		<flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
+		<flag name='systemd'>Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild
index c8a1b7297631..c8b4af35cb90 100644
--- a/sys-fs/udisks/udisks-2.1.0.ebuild
+++ b/sys-fs/udisks/udisks-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.12 2013/05/01 11:11:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.13 2013/07/18 10:36:41 ssuominen Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils linux-info systemd udev
@@ -12,7 +12,7 @@ SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug crypt +gptfdisk +introspection selinux systemd"
+IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
 
 UDEV_VERSION="197"
 COMMON_DEPEND=">=dev-libs/glib-2.32
@@ -29,7 +29,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/util-linux-2.20.1-r2
 	>=sys-block/parted-3
 	virtual/eject
-	crypt? ( sys-fs/cryptsetup )
+	cryptsetup? (
+		sys-fs/cryptsetup[udev(+)]
+		sys-fs/lvm2[udev(+)]
+		)
 	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets