Add mising comma in the fs whitelist that caused filesystems like ntfs to be excluded...

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

5 files changed, 34 insertions, 88 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 913e293f3ec2..b7af9186c954 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.40 2011/04/27 14:03:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.41 2011/05/09 16:14:55 ssuominen Exp $
+
+*udisks-1.0.2-r3 (09 May 2011)
+
+  09 May 2011; Samuli Suominen <ssuominen@gentoo.org> +udisks-1.0.2-r3.ebuild,
+  +files/udisks-1.0.2-missing_comma.patch:
+  Add missing comma in fs whitelist to replace the -ntfs-3g.patch.
 
 *udisks-1.0.2-r2 (27 Apr 2011)
 
diff --git a/sys-fs/udisks/files/udisks-1.0.2-missing_comma.patch b/sys-fs/udisks/files/udisks-1.0.2-missing_comma.patch
new file mode 100644
index 000000000000..746ff70724b9
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.2-missing_comma.patch
@@ -0,0 +1,24 @@
+From 75b6187f77ca95ce435dd78f2ecb244af55e7faf Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Mon, 09 May 2011 16:03:13 +0000
+Subject: Add missing comma in fs whitelist
+
+https://bugs.freedesktop.org/show_bug.cgi?id=36361
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+diff --git a/src/device.c b/src/device.c
+index 22779c7..6a34940 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -5905,7 +5905,7 @@ static const gchar *well_known_filesystems[] =
+   "msdos",
+   "umsdos",
+   "vfat",
+-  "exfat"
++  "exfat",
+   "ntfs",
+   NULL,
+ };
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch b/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
deleted file mode 100644
index 0f600d7be35f..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.2-ntfs-3g.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Unsure if this patch should go here, or baselayout's /etc/filesystems.
-
-Waiting for upstream reply: http://bugs.freedesktop.org/show_bug.cgi?id=36361
-
---- src/device.c
-+++ src/device.c
-@@ -5909,6 +5909,7 @@
-   "vfat",
-   "exfat"
-   "ntfs",
-+  "ntfs-3g",
-   NULL,
- };
- 
diff --git a/sys-fs/udisks/udisks-1.0.2-r2.ebuild b/sys-fs/udisks/udisks-1.0.2-r3.ebuild
index 7dd238780780..54f4803eb025 100644
--- a/sys-fs/udisks/udisks-1.0.2-r2.ebuild
+++ b/sys-fs/udisks/udisks-1.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2-r2.ebuild,v 1.1 2011/04/27 14:03:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2-r3.ebuild,v 1.1 2011/05/09 16:14:55 ssuominen Exp $
 
 EAPI=4
 inherit eutils bash-completion linux-info
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 RESTRICT="test" # this would need running dbus and sudo available
 
 pkg_setup() {
-	DOCS="AUTHORS HACKING NEWS README"
+	DOCS=( AUTHORS HACKING NEWS README )
 
 	if use amd64 || use x86; then
 		CONFIG_CHECK="~USB_SUSPEND ~!IDE"
@@ -49,13 +49,12 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-CVE-2010-4661.patch \
-		"${FILESDIR}"/${P}-ntfs-3g.patch
+		"${FILESDIR}"/${P}-missing_comma.patch
 }
 
 src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
-		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable debug verbose-mode) \
 		--enable-man-pages \
diff --git a/sys-fs/udisks/udisks-1.0.2.ebuild b/sys-fs/udisks/udisks-1.0.2.ebuild
deleted file mode 100644
index d6f97fedfb69..000000000000
--- a/sys-fs/udisks/udisks-1.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.2.ebuild,v 1.10 2011/04/17 18:15:59 reavertm Exp $
-
-EAPI=3
-inherit eutils bash-completion 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-147[extras]
-	>=dev-libs/glib-2.16.1:2
-	>=sys-apps/dbus-1.4.0
-	>=dev-libs/dbus-glib-0.92
-	>=sys-auth/polkit-0.97
-	>=sys-block/parted-1.8.8[device-mapper]
-	>=sys-fs/lvm2-2.02.66
-	>=dev-libs/libatasmart-0.14
-	>=sys-apps/sg3_utils-1.27.20090411
-	!sys-apps/devicekit-disks"
-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" # this would need running dbus and sudo available
-
-pkg_setup() {
-	if use amd64 || use x86; then
-		CONFIG_CHECK="~USB_SUSPEND ~!IDE"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		$(use_enable doc gtk-doc) \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	dobashcompletion tools/udisks-bash-completion.sh ${PN}
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-	keepdir /media
-}