Revert part of upstream commit that prevented UDisks1 from polling for floppy drive so often but while at it broke the actual mounting of floppies wrt #338185 by Ian Abbott and others

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 135 insertions, 9 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 6d77510cbd4d..7f676da6137d 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.118 2013/01/19 15:53:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.119 2013/01/25 04:34:39 ssuominen Exp $
+
+*udisks-1.0.4-r5 (25 Jan 2013)
+
+  25 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.4-r5.ebuild,
+  +files/udisks-1.0.4-revert-floppy.patch:
+  Revert part of upstream commit that prevented UDisks1 from polling for floppy
+  drive so often but while at it broke the actual mounting of floppies wrt
+  #338185 by Ian Abbott and others
 
   19 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.4-r4.ebuild,
   udisks-2.0.91.ebuild:
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index d7c759bf3466..b94636774970 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -4,22 +4,24 @@ Hash: SHA256
 AUX udisks-1.0.2-ntfs-3g.patch 198 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539 SHA512 3e9ba97d3d413e43df2c9e76dc88d9dc58d2f168509587228fc6c7b353111c9976b3cd1220bd4904d0e12ed2d804cd0807293a0982a8ee397692c676c567e716 WHIRLPOOL 365a00e248d6fe4ac7e5ce18a92b6f76611461ffe5c186e29eda521809381e3ec2c1bcc71b34f35513befdfcc99bec09fd741246a62e1b6feb48e95c31f841cc
 AUX udisks-1.0.4-drop-pci-db.patch 1003 SHA256 f6e735063c492e9bb319762ff92639212b9c2ca9235be0c0758c734218cd591f SHA512 ec0b1fa0dc6b186c1fff0f2101d1216b7b10123b57e6bf008e4c5092d120f15d3ee0a7379b21c85e567756cb165947c3a46669e882c69162903b72f8ae0dcbb8 WHIRLPOOL 8472b2377ba87760c3c10218867d70498f9ec7bf3bc4c67691a2438ee79bd43dcca465fde343e799e721a181335bbab07150bc4fe90deb11e1092743140b67a2
 AUX udisks-1.0.4-kernel-2.6.36-compat.patch 1441 SHA256 6b9ebe47adde63876b890f90b22979dd53c26ffb7e38171e9bd0e152f22f48aa SHA512 da57b1f431606d04a0b4d0590ad58b8caa6a317c301dcb650bd08a9aca292cc983711ba27fd6a8f6e4d0cd4d05198f08a99bb3913eec6079cf73a5fa893f3e01 WHIRLPOOL 4c9a5df9a11841d20945d625510a495c23571d2568c0e2e71851dd6f9d6c044021be268c706931dc7895cbb7a36b9b8a8e8fe9d0a92b0407986e704f2264bbaf
+AUX udisks-1.0.4-revert-floppy.patch 688 SHA256 65c0a6ec9a60762f6771d8e35bc71381feca9d40e27d6aa6374b374d3232d80f SHA512 044f40313ef5c8eeaac512d428e97b420507cd24cf25074768376733cf308676fbb1a429f462e4b06313344de1b7012b43ad4e6607d096758f0dd0e3effafbba WHIRLPOOL f02b378bbfca9c49a9d235aae29818772ef7ae05b5560aa67a326fe930925902bcc091aa121704bd47619b0b2f3b0c8d4ea01d076b603991a486e6c5cb274876
 AUX udisks-2.0.1-pragma.patch 1640 SHA256 816f47179013c7f46e429a8d24d4f9e6ab5aa1fe95e8cda216bb198ef3f1ed8a SHA512 1bb8cc292ae9491aafb3162690c4bbfab9c4cea26380a219d2bff118e0853820ca3bd70b6318d7bfdf1549d689093074101b09f0e5279fefc0e932a3ea4df1ab WHIRLPOOL c15db7878d0aac18d39520e3994c751289b2fc3c02ab8b5f5cfe370effb3afe67f49cb49f22386e37b7eecb7d7c7a35e78cb9c2b1ef9102e642613dba4caa14b
 DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-2.0.91.tar.bz2 813574 SHA256 52894a60825f58a8cd490be7d2b0f451943c3efe50a6a06176b0f907d9281cbe SHA512 df788e3cdbab0185f3d8054fe443e550fa797fc98b92cabf529ab7780263ddba6cfda421194b87458c0f82ec8fd89b8d606e7fdefccf71af2c898ca4ef516bbc WHIRLPOOL dafc2bf7f22446e29faf80fb4ad2ce91febf91874c657c3d80c4b466974a41fedba68eae5293a243a8e60348b9e39adaaea205978963f8cf53a650eea034d397
 EBUILD udisks-1.0.4-r2.ebuild 2359 SHA256 4ba023701e1a5c12d0dd0e58afdd63bb24dd3e323e3002ec9b102fd7a50e361b SHA512 64d95d89544fae58e57ae24f6483782377ab98deb8e0cd1b636697c9e0da30b04a89c811ba40f72fba0cea2f7c684bdd457176bf9c77b53c430b9e6756c187c9 WHIRLPOOL 9917d22798d023581445ac171c1acc6311f8ee5c3ac50fbbe07e418a617354853fcab5d64a17dfa225077efd1dec6f25875679e09e4d72b60f87aa356bdf8090
 EBUILD udisks-1.0.4-r4.ebuild 2654 SHA256 624b780475373b67dfd6af6e2cdbac5cc1974a530821b8ee72685e24704728ed SHA512 2f87e44831105ff06ddc360423b5de6a942f139541d8cfe21a52165b0cf38a33a713814b5f43ee9eebfb028f30e49a3d5adb60cb856effd2bbb81583cc1870e5 WHIRLPOOL 61eb6437aa69a02f033ff8c1bc2d9023f868abdbc9fe87b05485d4cee3b696546a41ef31500e08be47e54f724b1d78e079413e9f53700d17c575a0c7771c461d
+EBUILD udisks-1.0.4-r5.ebuild 2698 SHA256 b3c3ed46339eede9dc41eac40427b34e7b1016bc2374b03484abf4dacf35c74c SHA512 efa9e2c82eed8c0701412ed521b14bd2f7123cbc348ea0bd207ffb4457602d388503ad9d5cf3cb49cbd2b42252e86d1540c074d7e00b1c8ce765ca010a435190 WHIRLPOOL b78e84177deada79db14c6fe7ab52b8b6e7216ccc115078ab95add7571e36d9b322e594209302d099200e455d7e5369af1e31543e963850af3de64519c9d7d20
 EBUILD udisks-2.0.91.ebuild 2825 SHA256 dd5ef098c4a870e3ef62171aeb49f3a631a529015ed001b2c82a9a77ddd48913 SHA512 3d1fa5af1a1cc055575c169be936b4385bc203bb2a7ca63a4ac25db7062d10a30ab0d789964475bd367e1b06882cc739c55e45d63257dd32ec6eec7769898278 WHIRLPOOL 9302569ef1dfeab2e228f3583f6499e8e6a5f3ab6ceab235d3c4e92bd662f194473c7350eb5b82b1fcb3633b0155e3f55a2322cdf7c148f21c05d2d91d7b572b
-MISC ChangeLog 16938 SHA256 37a2b4ef1e192ac604be3254659436f182fb4e7bcd3c60dfef369b2bc008fc7a SHA512 0d0242df8a299f1100aa8929a5727c520d1a2613af897ed6dcd330e287eda5516b12475c512f6e6095be738c00ededc646065d1c0594e4ea264e3786a4cde73a WHIRLPOOL 11a34bb2e1d3b9d08b55d62164801ac0431df2c6bd74c5caa2244860bc453fc03099f25fe9898954475d4631c9031b37565a7dadb0a4277123642412aa1e1c25
+MISC ChangeLog 17283 SHA256 14fc1895e007db565af390c08b6acda0b3b3520ebf078d05ca0633882b7a0928 SHA512 4dac1c8ed975aa7246a4462eb0ae27c65fa6b38e2cec9a174b0cd34067575e01ff87e4b5261b8b383e67d6d3a7fe1619248a290e6294b4cdeccc986fd2e1d3ad WHIRLPOOL 119bd96c1b2c97f525e3e97e291b122be3521e74aa3e779d32d12e574163880a35357385c87a44304459d3daaef492bf56df46c5edca6e713c390c1e9a07c379
 MISC metadata.xml 673 SHA256 17e74f564943ba8dc4c7fcb8950755cf0cecdd88c9ab0fe7485ef2a363000f8c SHA512 f5004914ab449164d2cc9146a18215bbbffbf1fe09ed5078ea4cacc02ce83f0ce25b49a9e0e67c0cce6f7e0f0ff0099a0c3f66b59c36407ace837285525054bd WHIRLPOOL ed7342b97f9efcc5e5b88c543f34aa4b2228110685550ce7dfe8e3e0f1a3ce13a0aa0d36d49313156130578e78db030a5db03c603a9b1c2f78d097e6c54ba3dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ+sE8AAoJEEdUh39IaPFNSzUH/0pa22to0ih1k7DVwmkaXeUj
-Cmj9yQ6osUvSf/wlwaWJIzyw6ebnTJZd1PQGG155eavYsg6WNa/J/DDVhoe5Zfp7
-oVGQTj6zU1gb+JMTNFpOy/APO5SqAiuEiu2MzQSwt9Fkl/yvHAcv9oraZoyW2vyS
-hZHUHz2HaNpPTRxoQsu7CYtmBitp6Z7YghDM6Mx1HaYtzdUBLcl++Q8JyvRtbKVQ
-J4WlryyrvKVEx8CigyZb5NZnOP5jRfzdVZkcfNwsfRFVCqjIs/jB0I8qj5CFqiiC
-O7hRQf8T8SjlZJJMyqSJ/tTsd6DqVJv2sgXhCAqOQufT7OhzzcAmPUIaEsHpIlU=
-=Sauf
+iQEcBAEBCAAGBQJRAgtPAAoJEEdUh39IaPFNnzgH/Ax0U1xq6kul2WNS3w+6zfGT
+8E28rgkl5KduITEEXhqHrcKdOcFLS54/J/TLKMU2HQqC1rWyQb8M181m/zBHz100
+oAVrO03TzsSQ8jLQIFZCjBuMjV3D9LUaS+/gKywgc6BE7BRCzRbdH3ZB5PykEb/9
+YSNRf5JlkUaiur2qcWySz7lndNiVDCpfUu4xfylraraE8Bn/s1A8EPUaZLNuxhro
+3eNGzX3UrmYThnCdcu8ba8BZrjCSSzRzYmY8tEUGBiu0wGcTEXG27tBVzgp1kwiW
+37IbAaS0N9ZwRb1RWf2Do9Nwygpq3763W+IF5zRFXwhi5xNgk9X4lqJRwY5j4c4=
+=oAef
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch b/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
new file mode 100644
index 000000000000..0f13a6aba833
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.4-revert-floppy.patch
@@ -0,0 +1,18 @@
+This change was done upstream to prevent UDisks1 from polling for floppy drive so often but broke
+mounting floppies while at it.
+
+http://bugs.freedesktop.org/show_bug.cgi?id=30283
+http://bugs.gentoo.org/show_bug.cgi?id=338185
+
+--- src/device.c
++++ src/device.c
+@@ -4485,7 +4485,8 @@ update_info (Device *device)
+         }
+       else
+         {
+-          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA"))
++          if (g_udev_device_get_property_as_boolean (device->priv->d, "ID_CDROM_MEDIA") ||
++              g_udev_device_get_property_as_boolean (device->priv->d, "ID_DRIVE_FLOPPY"))
+             {
+               media_available = TRUE;
+             }
diff --git a/sys-fs/udisks/udisks-1.0.4-r5.ebuild b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
new file mode 100644
index 000000000000..9a65bc6e9e96
--- /dev/null
+++ b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 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.1 2013/01/25 04:34:39 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-197[gudev,hwdb]
+	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+=" ~USB_SUSPEND" #331065
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		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
+}