gentoo resync : 25.08.2020

4 files changed, 25 insertions, 14 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index ef4be71c0999..0a1d51727bc4 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
-DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
 DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
-EBUILD udisks-2.8.4.ebuild 3279 BLAKE2B d3a35670627a2cfa8f211efd0e38439ebb9b5aebf968d8dbdf3670f501d9ffac3a0665ffa85e894fb9eb31bf20240822d1650676ba2aef0a97fb873afa7bfa27 SHA512 bc3664b7a2e18c537ce33cbaf2931c113387bcf110b524b77f5ca2346c54e4d3e998accdb1cc075ae990becc09238ec7efd6543c5a2bff457710491ef2f150af
-EBUILD udisks-2.9.0.ebuild 3392 BLAKE2B 76ab015d09348290ef4e3456856e05147b7ba278eac4ddf6136f99d424226866d201ecba3fb880474f48e4fa082f33188969304a59a878a7d2094dde2dbde7dd SHA512 08c02d009d0614fc9907b55d9e065257c18a809fedab9823cffdd3b986046399d68178f94de8db0c2fac0185cde3545545a534bf42f15a753e9b25971f860705
-MISC metadata.xml 641 BLAKE2B 705b9b22bf911c442ba6529cc6481916d703bb43a741e731e65607be9d916be9db9b8bc75ca4b5e867ded9321f0fc2cd5d8c3c4f3c67908d639d6d6bb1416614 SHA512 b24f65a685c3d17b113467b274f2fe7acd46641e9afb9c87a6a23ff182d1b841c19540c57c92d7a346a80a077dfff9fb79ce98d564737d2af3001ed9c8f79013
+DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
+EBUILD udisks-2.9.0.ebuild 3384 BLAKE2B 86fefe57eb435e5d77b734a22aa86f33fe44e410a36a16ea00e9e1b302ddc9d0852a3f524f50e46e1ecec59cd7072ec28f64696dd937a27e9c5ea0569073a12b SHA512 bc22927d295a93bf4d4054344f1cb379ee35a26cd2257931d56e2021035e28413b5f3b6bf848b2efdfa6ae5fdc84526e959d2a3c41ca4eddc5d24c6b6f1705ee
+EBUILD udisks-2.9.1.ebuild 3480 BLAKE2B 0536feb36b0240f126381ac5a67070dd8600eb14db6d6bde821c6fdd404c1cace49b743187a65e6274e83283625c03be5cdff907390542790db4992dcce21805 SHA512 aa971030e093510e6c0762a19782e092a1c34ab950b67645b16e860a2a92d8dd98e1396e598915ccd6a9ae3ad5ebc6c1a1e6ab2856b422f480777f3556be68c1
+MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 83ff308110f9..fbdc7a76f53c 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -10,5 +10,6 @@
 		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 		<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
+		<flag name="zram">Enable ZRAM support (requires <pkg>sys-apps/systemd</pkg>).</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.0.ebuild
index 020910ffa396..e86b1253b377 100644
--- a/sys-fs/udisks/udisks-2.9.0.ebuild
+++ b/sys-fs/udisks/udisks-2.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="
@@ -21,13 +21,13 @@ REQUIRED_USE="
 
 COMMON_DEPEND="
 	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
 	daemon? (
 		>=dev-libs/glib-2.50:2
 		>=dev-libs/libatasmart-0.19
 		>=dev-libs/libgudev-165:=
-		>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	)
 	elogind? ( >=sys-auth/elogind-219 )
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.9.1.ebuild
index 357af8aca47a..a85f499c4a42 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.9.1.ebuild
@@ -10,29 +10,37 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libatasmart-0.19
-	>=dev-libs/libgudev-165:=
 	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
 	elogind? ( >=sys-auth/elogind-219 )
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 	lvm? ( sys-fs/lvm2 )
 	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-2.24[kbd] )
 "
 # util-linux -> mount, umount, swapon, swapoff (see also #403073)
 RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.30
 	>=sys-block/parted-3
 	virtual/eject
+	daemon? ( >=sys-apps/util-linux-2.30 )
 	selinux? ( sec-policy/selinux-devicekit )
 "
 DEPEND="${COMMON_DEPEND}
@@ -83,12 +91,14 @@ src_configure() {
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 		--with-udevdir="$(get_udevdir)"
 		$(use_enable acl)
+		$(use_enable daemon)
 		$(use_enable debug)
 		$(use_enable introspection)
 		$(use_enable lvm lvm2)
 		$(use_enable lvm lvmcache)
 		$(use_enable nls)
 		$(use_enable vdo)
+		$(use_enable zram)
 	)
 	econf "${myeconfargs[@]}"
 }