Update to latest LVM2 API.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 121 insertions, 5 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index e66e3db03ea9..078058e555ba 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.8 2010/05/13 17:29:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.9 2010/06/24 13:59:01 ssuominen Exp $
+
+*udisks-1.0.1-r1 (24 Jun 2010)
+
+  24 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +udisks-1.0.1-r1.ebuild, +files/udisks-1.0.1-lvm2_api_support.patch:
+  Update to latest LVM2 API.
 
   13 May 2010; Joseph Jezak <josejx@gentoo.org> udisks-1.0.1.ebuild:
   Marked ~ppc64 for bug #316277.
diff --git a/sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch b/sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch
new file mode 100644
index 000000000000..be81abbed26a
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.1-lvm2_api_support.patch
@@ -0,0 +1,106 @@
+From 2b2fcf80841972b70ad695a5a1ed74487d4fd37a Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Wed, 19 May 2010 17:01:31 +0000
+Subject: Update to latest LVM2 API
+
+See
+
+ http://lists.freedesktop.org/archives/devkit-devel/2010-April/000783.html
+---
+diff --git a/src/probers/udisks-lvm-pv-export.c b/src/probers/udisks-lvm-pv-export.c
+index 5675fb8..ee6d8ed 100644
+--- a/src/probers/udisks-lvm-pv-export.c
++++ b/src/probers/udisks-lvm-pv-export.c
+@@ -47,7 +47,7 @@ find_vg_for_pv_uuid (lvm_t        lvm_ctx,
+               struct lvm_pv_list *pv_list;
+               dm_list_iterate_items (pv_list, pvs)
+                 {
+-                  char *uuid;
++                  const char *uuid;
+                   pv_t pv = pv_list->pv;
+ 
+                   uuid = lvm_pv_get_uuid (pv);
+@@ -58,10 +58,8 @@ find_vg_for_pv_uuid (lvm_t        lvm_ctx,
+                           if (out_pv != NULL)
+                             *out_pv = pv;
+                           ret = vg;
+-                          dm_free (uuid);
+                           goto out;
+                         }
+-                      dm_free (uuid);
+                     }
+                 }
+             }
+@@ -79,12 +77,12 @@ find_vg_for_pv_uuid (lvm_t        lvm_ctx,
+ static void
+ print_vg (vg_t vg)
+ {
+-  char *s;
++  const char *s;
+   struct dm_list *pvs;
+   struct dm_list *lvs;
+ 
+-  s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); dm_free (s);
+-  s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); dm_free (s);
++  s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s);
++  s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s);
+   g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg));
+   g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg));
+   g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg));
+@@ -117,17 +115,14 @@ print_vg (vg_t vg)
+       str = g_string_new (NULL);
+       dm_list_iterate_items (pv_list, pvs)
+         {
+-          char *uuid;
++          const char *uuid;
+           guint64 size;
+           guint64 free_size;
+           pv_t pv = pv_list->pv;
+ 
+           uuid = lvm_pv_get_uuid (pv);
+           if (uuid != NULL)
+-            {
+-              g_string_append_printf (str, "uuid=%s", uuid);
+-              dm_free (uuid);
+-            }
++            g_string_append_printf (str, "uuid=%s", uuid);
+           size = lvm_pv_get_size (pv);
+           g_string_append_printf (str, ";size=%" G_GUINT64_FORMAT, size);
+           free_size = lvm_pv_get_free (pv);
+@@ -173,8 +168,8 @@ print_vg (vg_t vg)
+       str = g_string_new (NULL);
+       dm_list_iterate_items (lv_list, lvs)
+         {
+-          char *uuid;
+-          char *name;
++          const char *uuid;
++          const char *name;
+           gboolean is_active;
+           guint64 size;
+           lv_t lv = lv_list->lv;
+@@ -195,11 +190,6 @@ print_vg (vg_t vg)
+               g_string_append_printf (str, "active=%d", is_active);
+               g_string_append_c (str, ' ');
+             }
+-
+-          if (uuid != NULL)
+-            dm_free (uuid);
+-          if (name != NULL)
+-            dm_free (name);
+         }
+       g_print ("UDISKS_LVM2_PV_VG_LV_LIST=%s\n", str->str);
+       g_string_free (str, TRUE);
+@@ -212,9 +202,9 @@ print_vg (vg_t vg)
+ static void
+ print_pv (pv_t pv)
+ {
+-  char *s;
++  const char *s;
+ 
+-  s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s); dm_free (s);
++  s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s);
+   g_print ("UDISKS_LVM2_PV_NUM_MDA=%" G_GUINT64_FORMAT "\n", lvm_pv_get_mda_count (pv));
+ 
+   /* TODO: ask for more API in liblvm - pvdisplay(8) suggests more information
+--
+cgit v0.8.3-6-g21f6
diff --git a/sys-fs/udisks/udisks-1.0.1.ebuild b/sys-fs/udisks/udisks-1.0.1-r1.ebuild
index cb36de1c7a53..408f177d9008 100644
--- a/sys-fs/udisks/udisks-1.0.1.ebuild
+++ b/sys-fs/udisks/udisks-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.1.ebuild,v 1.4 2010/05/13 17:29:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.1-r1.ebuild,v 1.1 2010/06/24 13:59:01 ssuominen Exp $
 
 EAPI=3
-inherit bash-completion
+inherit eutils bash-completion
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=sys-fs/udev-147[extras]
 	>=dev-libs/dbus-glib-0.82
 	>=sys-auth/polkit-0.92
 	>=sys-apps/parted-1.8.8[device-mapper]
-	>=sys-fs/lvm2-2.02.61
+	>=sys-fs/lvm2-2.02.66
 	>=dev-libs/libatasmart-0.14
 	>=sys-apps/sg3_utils-1.27.20090411
 	!sys-apps/devicekit-disks"
@@ -37,6 +37,10 @@ DEPEND="${COMMON_DEPEND}
 # This would require running dbus and also sudo.
 RESTRICT="test"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lvm2_api_support.patch
+}
+
 src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}/var" \
@@ -54,7 +58,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS HACKING NEWS README
 
-	rm -f "${D}"/etc/profile.d/udisks-bash-completion.sh
+	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
 	dobashcompletion tools/udisks-bash-completion.sh ${PN}
 
 	find "${ED}" -name '*.la' -delete