old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

8 files changed, 8 insertions, 494 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 204e1b2c30d7..3f85c67f1f2e 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.162 2014/03/24 14:34:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.163 2014/03/25 09:19:55 ssuominen Exp $
+
+  25 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/udisks-1.0.4-drop-pci-db.patch,
+  -files/udisks-1.0.4-kernel-2.6.36-compat.patch,
+  -files/udisks-2.1.0-ieee1394.patch, -udisks-1.0.4-r5.ebuild,
+  -udisks-2.1.0.ebuild, -udisks-2.1.1.ebuild, -udisks-2.1.2.ebuild:
+  old
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> udisks-1.0.5.ebuild,
   udisks-2.1.3.ebuild:
diff --git a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch b/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
deleted file mode 100644
index 852835b0287e..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
-Author: Tom Gundersen <teg@jklm.no>
-Date:   2 days ago
-
-    udev: remove redundant call to deprecated pci-db
-
-    The binary is no longer shipped with systemd/udev. The functionality
-    is taken over by a builtin, which is ran for all devices, rendering
-    this rule superfluous.
-
-    Cc: Jan de Groot <jgc@archlinux.org>
-    Signed-off-by: Tom Gundersen <teg@jklm.no>
-
-diff --git a/data/80-udisks.rules b/data/80-udisks.rules
-index d1c8c5d..4bf2b37 100644
---- a/data/80-udisks.rules
-+++ b/data/80-udisks.rules
-@@ -1,10 +1,6 @@
- # Do not edit this file, it will be overwritten on updates
- #
-
--# import names for PCI storage controllers
--#
--SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
--
- # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
- # the device is on a cardbus controller (upper PCI device) - then we check
- # vid/pid (lower PCI device)
diff --git a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch b/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
deleted file mode 100644
index fef15ea20852..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Sun, 04 Sep 2011 18:42:17 +0000
-Subject: Fix power/level deprecation kernel warning
-
-If present, use power/control instead.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=32056
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
-index fc88043..eeafcab 100644
---- a/src/helpers/job-drive-detach.c
-+++ b/src/helpers/job-drive-detach.c
-@@ -235,7 +235,12 @@ main (int argc,
-   if (endp != NULL && num_interfaces == 1)
-     {
-       g_printerr ("Suspending USB device: ");
--      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
-+      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
-+        power_level_path = "power/control";
-+      else
-+        power_level_path = "power/level";
-+      
-+      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
-           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
-         goto out;
-       g_printerr ("OK\n");
-@@ -259,7 +264,6 @@ main (int argc,
-  out:
-   g_free (usb_interface_name);
-   g_free (unbind_path);
--  g_free (power_level_path);
-   if (sg_fd > 0)
-     sg_cmds_close_device (sg_fd);
-   if (udevice != NULL)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch b/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
deleted file mode 100644
index 9df3ad41c09a..000000000000
--- a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b841e30a98459816dfc49a735d3db4355a88edcd Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 19 Mar 2013 04:31:40 +0000
-Subject: Properly identify firewire devices as non-system devices
-
-This was reported in bug 62077.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62077
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
-index a1781cf..d619850 100644
---- a/src/udiskslinuxblock.c
-+++ b/src/udiskslinuxblock.c
-@@ -354,7 +354,7 @@ update_hints (UDisksLinuxBlock  *block,
-       connection_bus = udisks_drive_get_connection_bus (drive);
-       removable = udisks_drive_get_media_removable (drive);
-       if (removable ||
--          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "firewire") == 0) ||
-+          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) ||
-           (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk")))
-         {
-           hint_system = FALSE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-1.0.4-r5.ebuild b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
deleted file mode 100644
index 134b76e97f84..000000000000
--- a/sys-fs/udisks/udisks-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r5.ebuild,v 1.13 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit eutils bash-completion-r1 linux-info udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=sys-apps/dbus-1.6
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	>=sys-fs/lvm2-2.02.66
-	>=virtual/udev-208[gudev]
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-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+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${P}-kernel-2.6.36-compat.patch \
-		"${FILESDIR}"/${P}-drop-pci-db.patch \
-		"${FILESDIR}"/${P}-revert-floppy.patch
-
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" data/80-udisks.rules || die
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		--enable-lvm2 \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		slashsbindir=/usr/sbin \
-		slashlibdir=/usr/lib \
-		udevhelperdir="$(udev_get_udevdir)" \
-		udevrulesdir="$(udev_get_udevdir)"/rules.d \
-		install #398081
-
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	prune_libtool_files --all
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}
diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild
deleted file mode 100644
index 78fe6dbcb5bc..000000000000
--- a/sys-fs/udisks/udisks-2.1.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 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.16 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-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 cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-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+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ieee1394.patch \
-		"${FILESDIR}"/${P}-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	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
-}
diff --git a/sys-fs/udisks/udisks-2.1.1.ebuild b/sys-fs/udisks/udisks-2.1.1.ebuild
deleted file mode 100644
index 65a0030c557f..000000000000
--- a/sys-fs/udisks/udisks-2.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.1.ebuild,v 1.2 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-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 cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-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+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	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
-}
diff --git a/sys-fs/udisks/udisks-2.1.2.ebuild b/sys-fs/udisks/udisks-2.1.2.ebuild
deleted file mode 100644
index ef1c74719c1b..000000000000
--- a/sys-fs/udisks/udisks-2.1.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.2.ebuild,v 1.5 2014/02/23 08:48:50 ago Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-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 cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-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+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	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
-}