From 4e0ce4645a41ad86edecfc004800eaf33dcdf63e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 22 Jan 2013 21:33:09 +0200
Subject: [PATCH] udisks: remove lvm2 support

---
 packages/sysutils/udisks/install              |  2 --
 packages/sysutils/udisks/meta                 |  4 +--
 .../udisks-1.0.4-remove-lvm2-support.patch    | 29 +++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch

diff --git a/packages/sysutils/udisks/install b/packages/sysutils/udisks/install
index 3f2d0fdc92..a27c17503b 100755
--- a/packages/sysutils/udisks/install
+++ b/packages/sysutils/udisks/install
@@ -26,10 +26,8 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/data/org.freedesktop.UDisks.conf  $INSTALL/etc/dbus-1/system.d
 
 mkdir -p $INSTALL/lib/udev
-  cp -P $PKG_BUILD/src/probers/udisks-dm-export $INSTALL/lib/udev
   cp -P $PKG_BUILD/src/probers/udisks-part-id $INSTALL/lib/udev
   cp -P $PKG_BUILD/src/probers/udisks-probe-ata-smart $INSTALL/lib/udev
-  cp -P $PKG_BUILD/src/probers/udisks-probe-sas-expander $INSTALL/lib/udev
 
 mkdir -p $INSTALL/lib/udev/rules.d
 #  cp $PKG_BUILD/data/80-udisks.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/sysutils/udisks/meta b/packages/sysutils/udisks/meta
index b1aff0f268..c7a39234ed 100644
--- a/packages/sysutils/udisks/meta
+++ b/packages/sysutils/udisks/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/udisks"
 PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart"
-PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart"
+PKG_DEPENDS="sg3_utils systemd glib dbus dbus-glib parted polkit libatasmart"
+PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted polkit libatasmart"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="udisks: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management."
diff --git a/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch b/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch
new file mode 100644
index 0000000000..8fbe5dcbee
--- /dev/null
+++ b/packages/sysutils/udisks/patches/udisks-1.0.4-remove-lvm2-support.patch
@@ -0,0 +1,29 @@
+diff --git a/configure.ac b/configure.ac
+index 50c0fe2..1d67de7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,10 +159,6 @@ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
+ AC_SUBST(LIBPARTED_CFLAGS)
+ AC_SUBST(LIBPARTED_LIBS)
+ 
+-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
+-AC_SUBST(DEVMAPPER_CFLAGS)
+-AC_SUBST(DEVMAPPER_LIBS)
+-
+ have_lvm2=no
+ AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--enable-lvm2], [enable LVM2 support]))
+ if test "x$enable_lvm2" = "xyes"; then
+diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
+index 06bb566..578b8ae 100644
+--- a/src/probers/Makefile.am
++++ b/src/probers/Makefile.am
+@@ -22,9 +22,7 @@ INCLUDES = \
+ 
+ udevhelperdir = $(slashlibdir)/udev
+ udevhelper_PROGRAMS =	udisks-part-id 			\
+-			udisks-dm-export 		\
+ 		      	udisks-probe-ata-smart 		\
+-			udisks-probe-sas-expander 	\
+ 			$(NULL)
+ 
+ if HAVE_LVM2