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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 94 insertions, 9 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/Manifest b/sys-fs/udisks/Manifest
index 0777d4af7ec4..6fd1b5a030bd 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 AUX udisks-1.0.2-ntfs-3g.patch 198 RMD160 e4b5cb3386184edf90bce5140a1c414ef5e99210 SHA1 d3ee3999b9d0437a6022d85d4535fc72632f6258 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539
 DIST udisks-1.0.4.tar.gz 719889 RMD160 163a8046fcc7f30d48b8272859ab0d09a88f179a SHA1 10d2acfd6e6ff4c8d9d962af1fb1856a885e3219 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
 EBUILD udisks-1.0.4-r1.ebuild 2032 RMD160 04d090ed0171f8f325fd56552c894422adb4d49b SHA1 dde90f398bab1eef95e18720eca31725e5adfcca SHA256 cda270fa2ede1c1bff53b7e67ab608f78bc831d2c0f2916afbe3ab3d9350db6c
-MISC ChangeLog 8588 RMD160 4e191b00720ca06c63337556874c3def586374a0 SHA1 cc890e5754e8064bd8064bbd0ece261e6e81929d SHA256 bb0bbf0641f6317f47ab3974751e38441e4d5f0841ac9a534157380239e007c9
+EBUILD udisks-1.0.4-r2.ebuild 2096 RMD160 32333177e933eff85c34db82b8fcbf62eb042572 SHA1 ba69c4e2fe58e3a8c8ccfc9d136a854a37987cc9 SHA256 4819792b660217fccd94cf92efa8f512d591d42c08314dd11d46ccdb2c56ffc6
+MISC ChangeLog 8775 RMD160 1641c31252cefc4e53f6b910f014a4d8a5b5e192 SHA1 d9757cb933078331924f8c91ae83144fe6a152c6 SHA256 ddd49cf6e1e0d550ab60afdbecc4f499440eab6aa7adf6a3265406b801094d71
 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPDLnpAAoJEEdUh39IaPFNNnYH/RN4JnqsuoYEJITZMgEAgPBb
-W/PK+byDz696U92MQknu6Y0IOMRtH/8aBY3LjUtFmqZneDLeGon8ON7vIX+1fjNs
-11cWChhYUSqDTZ+CYdHO3YgavNmE8HZ8WaCcI5sKkXQoESu/E2LSSjf1mhzmuaUK
-tcIig/mulQQZvwOe6DqUNgrJEYhta0EIzdybFmnM9MPfVIFGCbrxVPhSNrsF25NJ
-nBZ6QsjweqPRsVR9U7W7ZGZqO25U+7avv+uSQnSqRpe+QIXGejCWvjoEDmRHnLDW
-XwppJ3cND1oI0iNCRb9veOhwpkQv1LRC+Gd9QHIbUwZy8oOlhYdC6VjVSuMK1m4=
-=g1/R
+iQEcBAEBAgAGBQJPHLeVAAoJEEdUh39IaPFNDy4H/1cjMu6SOB2xEir3aF5QIycj
+0lmkhDrxag4j3Jrxx06Oh6aKeGM4bp8hIMx/p1t8xQGCuOl+TVsp3TAvDGcR6GG4
+VJ3FVHsV0vZndD4khxu926MZLKVGtuBH523TB1D+IMGVo42gAO4PdCKvzndmD9ze
+G+omt5X76cD+8rqZqrYeO2MIsCFy+JlTOFOvADwjpo8tnZD7875u6OH9T01CMoG2
+s63yvXgMcF7f9XTqbvXbLS1p8MQY6PPjUy88eLVkWt+125bIFvlya9aPbdtRMSsM
+SQbCvrBuYgwW9uXVizM3e/RaBV/oDL8DnyHZ3VY1/QFi82ijgrmsAzbBzeZ2Chg=
+=aT3y
 -----END PGP SIGNATURE-----
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
+}