gentoo resync : 21.06.2020

3 files changed, 131 insertions, 1 deletions

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 1eeed1ebe303..ef4be71c0999 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,3 +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
-MISC metadata.xml 562 BLAKE2B cb4420b855989175ed12f77be26d3e9c42375d64abf397ae7a5ec9da49383d6e45d43ead2057070c09d6849e16f0cbdaba6a863c2d3760ec39f251224371387c SHA512 bec0d8698846724ea9f8cec0a4745af6e0723265248ae1953c19dfd0df9904b37554fe8cd5c5dac554e03d6c822b1324bd6d787a56f92006e189f7940c98d54d
+EBUILD udisks-2.9.0.ebuild 3392 BLAKE2B 76ab015d09348290ef4e3456856e05147b7ba278eac4ddf6136f99d424226866d201ecba3fb880474f48e4fa082f33188969304a59a878a7d2094dde2dbde7dd SHA512 08c02d009d0614fc9907b55d9e065257c18a809fedab9823cffdd3b986046399d68178f94de8db0c2fac0185cde3545545a534bf42f15a753e9b25971f860705
+MISC metadata.xml 641 BLAKE2B 705b9b22bf911c442ba6529cc6481916d703bb43a741e731e65607be9d916be9db9b8bc75ca4b5e867ded9321f0fc2cd5d8c3c4f3c67908d639d6d6bb1416614 SHA512 b24f65a685c3d17b113467b274f2fe7acd46641e9afb9c87a6a23ff182d1b841c19540c57c92d7a346a80a077dfff9fb79ce98d564737d2af3001ed9c8f79013
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index b4357b2df5b0..83ff308110f9 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -5,6 +5,7 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="daemon">Build the system daemon, not just the client tool</flag>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<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>
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.0.ebuild
new file mode 100644
index 000000000000..020910ffa396
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.110
+	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:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	virtual/eject
+	daemon? ( >=sys-apps/util-linux-2.30 )
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--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)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}