Move umount.udisks from /sbin to /usr/sbin wrt #398081 by Michał Górny

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

2 files changed, 85 insertions, 1 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 76343c8dbe61..e4443ebcde55 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.63 2012/01/10 22:22:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.64 2012/01/23 01:30:05 ssuominen Exp $
+
+*udisks-1.0.4-r2 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.4-r2.ebuild:
+  Move umount.udisks from /sbin to /usr/sbin wrt #398081 by Michał Górny
 
   10 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.0.3-r1.ebuild,
   -files/udisks-1.0.3-mkfs-tempdir.patch:
diff --git a/sys-fs/udisks/udisks-1.0.4-r2.ebuild b/sys-fs/udisks/udisks-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..6267c5ce6f86
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.4-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/01/23 01:30:05 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion-r1 linux-info
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug doc nls remote-access"
+
+COMMON_DEPEND="
+	|| ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] )
+	>=dev-libs/glib-2.16.1
+	>=sys-apps/dbus-1.4.0
+	>=dev-libs/dbus-glib-0.92
+	>=sys-auth/polkit-0.97
+	>=sys-block/parted-1.8.8
+	>=sys-fs/lvm2-2.02.66
+	>=dev-libs/libatasmart-0.14
+	>=sys-apps/sg3_utils-1.27.20090411"
+RDEPEND="${COMMON_DEPEND}
+	virtual/eject
+	remote-access? ( net-dns/avahi )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.0
+	dev-util/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+
+RESTRICT="test" # FIXME: dbus environment and sudo problems
+
+pkg_setup() {
+	if use amd64 || use x86; then
+		CONFIG_CHECK="~USB_SUSPEND ~!IDE"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch
+}
+
+src_configure() {
+	# device-mapper -> lvm2 -> is always a depend, force enabled
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		--enable-lvm2 \
+		--enable-dmmp \
+		$(use_enable remote-access) \
+		$(use_enable nls) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	emake DESTDIR="${D}" slashsbindir=/usr/sbin install #398081
+	dodoc AUTHORS HACKING NEWS README
+
+	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
+	newbashcomp tools/udisks-bash-completion.sh ${PN}
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	keepdir /media
+	keepdir /var/lib/udisks #383091
+}