Version bump. Optionalize sys-apps/gptfdisk wrt #412801, Comment #1 since it might not work for every arch.

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

4 files changed, 112 insertions, 12 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 88a3b6997b97..df8b1bcb94f3 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2012/04/20 18:49:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.74 2012/05/01 16:49:07 ssuominen Exp $
+
+*udisks-1.96.0 (01 May 2012)
+
+  01 May 2012; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.96.0.ebuild,
+  metadata.xml:
+  Version bump. Optionalize sys-apps/gptfdisk wrt #412801, Comment #1 since it
+  might not work for every arch.
 
   20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.93.0.ebuild:
   old
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index d972ceee610d..64feaf8389c4 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,20 +5,22 @@ AUX udisks-1.0.2-ntfs-3g.patch 198 RMD160 e4b5cb3386184edf90bce5140a1c414ef5e992
 AUX udisks-2.x-ntfs-3g.patch 147 RMD160 6e81c4e0d1f8935b8db63fae2a51ec6b92a1cc37 SHA1 d827c4bdb80b41dec8a571c02468634042bad6c3 SHA256 62891ef17a4ee404e6d827ee38f8c2d8115fc8a847ef2ba842118c81b779ffad
 DIST udisks-1.0.4.tar.gz 719889 RMD160 163a8046fcc7f30d48b8272859ab0d09a88f179a SHA1 10d2acfd6e6ff4c8d9d962af1fb1856a885e3219 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
 DIST udisks-1.94.0.tar.bz2 590375 RMD160 0e3832294b3ddb12a05ec251b66d1bb8c9088204 SHA1 6c76488776edbc5671a4b03a37ed61dac451211e SHA256 e58193c2f2f4fba030b6dd684708352b1eccf6826843e42899a26fef4249b0bc
+DIST udisks-1.96.0.tar.bz2 620783 RMD160 b4611ab36175cbe08277d5d7aacffb590cd586ae SHA1 2b13cc2d83b3f90c2a8bba2cb66246affe58273a SHA256 2818f431044905aa0301c2078adc2b734ec47697a2666985fd485b95f5460423
 EBUILD udisks-1.0.4-r1.ebuild 2032 RMD160 04d090ed0171f8f325fd56552c894422adb4d49b SHA1 dde90f398bab1eef95e18720eca31725e5adfcca SHA256 cda270fa2ede1c1bff53b7e67ab608f78bc831d2c0f2916afbe3ab3d9350db6c
 EBUILD udisks-1.0.4-r2.ebuild 2253 RMD160 f9a1562b63cf8e0ef225e6bc39292dcb82d6f496 SHA1 f07fde95a9c3bb515d37712e21de58969fa8dac9 SHA256 492d9e4b480b1b4def82fb196b06b481fa7ab9e79b76706a2bebeb4435681527
 EBUILD udisks-1.94.0-r1.ebuild 2414 RMD160 611ef4d442fa96aaea327081032182e795e94ba6 SHA1 db476f3336a3b76c4afaa95f08a5a75270d5aaf1 SHA256 ce15fa257a4101e7a509c9efda0a07cae154178e417fc9e6ce9f307ccf5667ae
 EBUILD udisks-1.94.0.ebuild 2092 RMD160 840af32b9e2c8454e497cbf5eecb7e1467fd5ec7 SHA1 0f25a2c96e3a3e52d6321ddc447858bae380cd0c SHA256 8f5223b2b6f3ba72d45cbd5d3e0266e3d643e0f45bd95d5154631d825538d5d0
-MISC ChangeLog 10425 RMD160 6bbaa2ac08a29220d141aa814afc17ebdc8ad135 SHA1 a50a4b6d181fd689a6b9ba562e02840167e9248d SHA256 39350f79a7c7036102e9c5fee7dbdf077551e28abc0bc43fd3256a342edfda3f
-MISC metadata.xml 465 RMD160 711189a7c9e9ca05ca9cfee7998a90c06511b3d3 SHA1 44ee701c4871c8eef4c76f30ebc5c8a0e8d858ba SHA256 bb99d5d24ef919a8643d6e08ec23aa209114442d14713dce32a43dd052f96116
+EBUILD udisks-1.96.0.ebuild 2486 RMD160 4ae6a7157ce4691efa79412a6de9f74ed67ef4d5 SHA1 223e7718767bba7c0c3f6a01d67c36207d1cc330 SHA256 fc3ada2ae7eadfb70436f6a7bd98c5c03cb5c5fc93b9bcb2236a200f5d30bd59
+MISC ChangeLog 10661 RMD160 de05c4e7914699f52ca34f40bd23a76781d4e2ed SHA1 8b03861b64e6621eb5b1ace2d77843ec7a2ae17c SHA256 2212b9c4b9c63a84bcaa3df2fe4f062c089a615545cec76fd0e15d2fa9f03f8f
+MISC metadata.xml 673 RMD160 b0a03a9802cae622d53d384ae8ad7836895746b9 SHA1 cad9804f14804e9ec0aa9beec37fcbee1442b011 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPka9LAAoJEEdUh39IaPFNuYsH/i6BVbTCIsh6gXHBZAmL6uIe
-S5xfGtfaJZh5t29Bn4bUZPdJoWR9RYzaNiFzaW2FbCDVHSCFpJ5hYJcSYrXGBzGi
-y2SH3TmxUOiOT3Jbd7z49xXz9cOqMw0nYYniu/4C7hq9CxDJV98dU3Ekn/Y2FlBK
-buRcbG4RmVChgH7Dr6BlyfuIjuDCcPjMrIC//75xdr2v61IoFttDNLhiWkenZ6GA
-iDHXRebZGT09QSfhbW/mKtNwqCbDqZ84fKWroxCh5xysN2JROx5ann4zXo+0dzs1
-zeVJOO7MGjiTFhOIujJknCINEpeSybe10JRR29iyKX3aQk6UU3DYcm3yN8d5omY=
-=SYnj
+iQEcBAEBAgAGBQJPoBOAAAoJEEdUh39IaPFN1WYH/2hwGP4fDcWxnyrATgV0Xjw8
+S778MCsvYMz5A8jviIiAF1s7xk9ITSNXwQ+VLLu6er/KIyL5nkNiFvJxKFPF7WZc
+du0EI1u7nBHHH9A03t60VpjjrGVxWBF5GdMBVSC+Uyrfp4mCtWcuzoHXqzQy7Oub
+Qoj0Gusm8JT47HhkY4HfMBnLmlc5Psm0u/ns4IihB0UcQKLwik4LoSON+QzTf0Qq
+HrwNMTfFhH+VXMztOe6I6pjkXHmwIiWIuaGV7yUyyXSD1vn21ClFwvT6XG3gpdgR
+Af7mJ0pXsPT0ciKYYfeBl5BrYepWwjbd5Ov9fm9qrVCyIrNnH2TQs/R4CBqhK3M=
+=LrML
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 69f8a9dc2e2a..b3e9582453ce 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -6,7 +6,9 @@
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <use>
-  	<flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
-	<flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name='gptfdisk'>Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
+    <flag name='systemd'>Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-1.96.0.ebuild b/sys-fs/udisks/udisks-1.96.0.ebuild
new file mode 100644
index 000000000000..6b7b6189ba2c
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.96.0.ebuild
@@ -0,0 +1,89 @@
+# 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.96.0.ebuild,v 1.1 2012/05/01 16:49:07 ssuominen Exp $
+
+EAPI=4
+inherit eutils bash-completion-r1 linux-info systemd
+
+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="~amd64 ~arm ~x86"
+IUSE="debug doc crypt +gptfdisk +introspection systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32
+	>=sys-auth/polkit-0.104-r1
+	>=dev-libs/libatasmart-0.18
+	|| ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] )
+	virtual/acl
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	systemd? ( >=sys-apps/systemd-44 )"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20.1-r2
+	>=sys-block/parted-3
+	virtual/eject
+	crypt? ( sys-fs/cryptsetup )
+	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
+	dev-util/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+
+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+=" ~USB_SUSPEND" #331065
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.x-ntfs-3g.patch
+
+	if ! use systemd; then
+		sed -i -e 's:libsystemd-login:&sSuOmInEnWaShErE:' configure || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	default
+
+	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
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	dobashcomp tools/udisksctl-bash-completion.sh
+
+	find "${ED}" -type f -name '*.la' -exec rm -f {} +
+
+	keepdir /media
+	keepdir /var/lib/udisks2 #383091
+}