Update to latest LVM2 API.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index e66e3db03ea98de5935abfa5eee0ca0288cec09b..078058e555ba7029ee2ba0a554dc036cc6bd14cd 100644 (file)
--- 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/Manifest b/sys-fs/udisks/Manifest
index 2a972a9d047f8d6f6fe61e4cdf35608099dda4f4..47fca864dbec073df2b1b39cb6c668aa56d318b7 100644 (file)
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX udisks-1.0.1-lvm2_api_support.patch 3825 RMD160 c5565b5b2a4152c39711b6588484340abb3d4aa5 SHA1 2c2da4d72713b9930dcb8f814336c566ff1e151c SHA256 0c4499285a6d0005c3a8633cb16cc8914bbdeeafc39e656b669e64faea9b04c8
 DIST udisks-1.0.1.tar.gz 714246 RMD160 f1583b73a0a7ca4a8b4fddf68813f2bb1321b2bb SHA1 ad3e2a79a2638b75448116b292262cfa1e909518 SHA256 d9bf1ab56667dfa12e99461c503736e3964cf94dd41f30a1229a0e173429b841
-EBUILD udisks-1.0.1.ebuild 1729 RMD160 1862c3ffd191886b0cdd94d40f4c9bccc09456ed SHA1 5fccb2abb33c5524422554260c521209c453e7bc SHA256 07597f9db4ee15530ce836ac574dff83f5bdaf33bdf521a5a663d1285a76b29d
-MISC ChangeLog 1548 RMD160 a27d10634a63fe5d5cb79f94029c02d7aef985f2 SHA1 0375c0f3152144c0983b350a5c8a47090e744966 SHA256 2ed7d563a10f91c2da074dae92ad5a1939d0bfbe67aec8669901c2849424e9c3
+EBUILD udisks-1.0.1-r1.ebuild 1812 RMD160 bb95248726f0f487b06d72829b305e5f6d705f25 SHA1 81dcf9fc99e7deae4eecd0cf7a8d7deee0cdbe85 SHA256 11ff8c75965313417b063cd3bc6365f060651c74f9fe7d5c9c6b3d450beaa7fa
+MISC ChangeLog 1738 RMD160 2b383f203d5a7c926f6cf440610cb0e540b84d0b SHA1 2b6e99c770b4b0bdfd39e6336650b51a20a5f2ec SHA256 a100fcd303ec404af4c96c89b30f0775248962a609f7a4dc35c69797a265a684
 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvsNr0ACgkQcsIHjyDViGSuGwCgmR90okZEZyqS1nIg49SF7qKx
-Xd8An208kJT3w708mth57EphxdCBg0/y
-=UZyR
------END PGP SIGNATURE-----

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 (file)
index 0000000..be81abb
--- /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
similarity index 83%
rename from sys-fs/udisks/udisks-1.0.1.ebuild
rename to sys-fs/udisks/udisks-1.0.1-r1.ebuild
index cb36de1c7a53eb281ef9a1ccb4783a65aac84b84..408f177d9008ca920781e62e548f7e5d219eaf35 100644 (file)
--- 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