summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-03-06 15:02:24 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-03-06 15:02:24 +0000
commitaaa722d02134cd5d8fa9ab2084587530cbfc7844 (patch)
treeb3eb97f5c3880f3199c425f955855c90ff709df0 /sys-apps
parentStable on sparc wrt #169473 (diff)
downloadgentoo-2-aaa722d02134cd5d8fa9ab2084587530cbfc7844.tar.gz
gentoo-2-aaa722d02134cd5d8fa9ab2084587530cbfc7844.tar.bz2
gentoo-2-aaa722d02134cd5d8fa9ab2084587530cbfc7844.zip
version bump thanks to iulica in bug 169593
(Portage version: 2.1.2-r12)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/ivman/ChangeLog8
-rw-r--r--sys-apps/ivman/files/digest-ivman-0.6.113
-rw-r--r--sys-apps/ivman/files/digest-ivman-0.6.143
-rw-r--r--sys-apps/ivman/files/ivman-0.6-hotpluggable.patch40
-rw-r--r--sys-apps/ivman/ivman-0.6.14.ebuild (renamed from sys-apps/ivman/ivman-0.6.11.ebuild)16
5 files changed, 62 insertions, 8 deletions
diff --git a/sys-apps/ivman/ChangeLog b/sys-apps/ivman/ChangeLog
index 7207fa922e97..1bc9a465120c 100644
--- a/sys-apps/ivman/ChangeLog
+++ b/sys-apps/ivman/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/ivman
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ChangeLog,v 1.50 2007/02/13 10:01:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ChangeLog,v 1.51 2007/03/06 15:02:24 genstef Exp $
+
+*ivman-0.6.14 (06 Mar 2007)
+
+ 06 Mar 2007; <genstef@gentoo.org> +files/ivman-0.6-hotpluggable.patch,
+ -ivman-0.6.11.ebuild, +ivman-0.6.14.ebuild:
+ version bump thanks to iulica in bug 169593
13 Feb 2007; Markus Rothe <corsair@gentoo.org> ivman-0.6.13.ebuild:
Stable on ppc64; bug #163436
diff --git a/sys-apps/ivman/files/digest-ivman-0.6.11 b/sys-apps/ivman/files/digest-ivman-0.6.11
deleted file mode 100644
index c7fc83e830f8..000000000000
--- a/sys-apps/ivman/files/digest-ivman-0.6.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 440db00c2d59c4d408812c9868ac4b32 ivman-0.6.11.tar.bz2 312191
-RMD160 cc7f3604e1984cbe2d75014f8a6f6ac163a6ca8a ivman-0.6.11.tar.bz2 312191
-SHA256 00a6f2be36a2a62cb6bf1b1c6d3f562aee168424e80f0bf378400930ebc1ae43 ivman-0.6.11.tar.bz2 312191
diff --git a/sys-apps/ivman/files/digest-ivman-0.6.14 b/sys-apps/ivman/files/digest-ivman-0.6.14
new file mode 100644
index 000000000000..de62eac906f0
--- /dev/null
+++ b/sys-apps/ivman/files/digest-ivman-0.6.14
@@ -0,0 +1,3 @@
+MD5 ebef12559268e2c5ea932cbb5aaa789e ivman-0.6.14.tar.bz2 318181
+RMD160 edb6cdd7a2fe772a0cfa1ad3a0d03c7adb54043a ivman-0.6.14.tar.bz2 318181
+SHA256 62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8 ivman-0.6.14.tar.bz2 318181
diff --git a/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch b/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch
new file mode 100644
index 000000000000..2f662a2fecc5
--- /dev/null
+++ b/sys-apps/ivman/files/ivman-0.6-hotpluggable.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/show_bug.cgi?id=169593
+ iulica@box.co.uk
+This patch tests also for a storage if it is hotpluggable and mounts it
+automatically. A reason of creating the patch can be found here:
+http://lists.freedesktop.org/archives/hal/2005-October/003441.html
+
+--- src/IvmConfig/IvmConfigCommon.c.old 2007-03-05 15:28:49.000000000 +0100
++++ src/IvmConfig/IvmConfigCommon.c 2007-03-05 15:34:36.000000000 +0100
+@@ -146,7 +146,9 @@
+ volume.policy.should_mount does not exist
+ AND { storage.policy.should_mount == TRUE on block.storage_device
+ OR { storage.policy.should_mount does not exist on
+- block.storage_device AND storage.removable == TRUE on
++ block.storage_device AND { storage.removable == TRUE
++ OR storage.hotpluggable == TRUE
++ } on
+ block.storage_device
+ }
+ }
+@@ -216,14 +218,16 @@
+ {
+ ivm_check_dbus_error(&dbus_error);
+ // OK, so no storage policy was specified anywhere. Now we'll mount
+- // if parent device is removable.
++ // if parent device is removable or hotpluggable.
+ if (
+- !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) ||
+- !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )
++ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) ||
++ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )) &&
++ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.hotpluggable", NULL ) ||
++ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.hotpluggable", NULL ))
+ ) {
+ DEBUG(_("\
+ Device %s won't be mounted because no mount policy was specified on \
+-volume or storage device and storage device does not appear to be removable"), device
++volume or storage device and storage device does not appear to be removable or hotpluggable"), device
+ );
+ libhal_free_string( device );
+ libhal_free_string( new_udi );
diff --git a/sys-apps/ivman/ivman-0.6.11.ebuild b/sys-apps/ivman/ivman-0.6.14.ebuild
index a99259ed8d13..90350ed10794 100644
--- a/sys-apps/ivman/ivman-0.6.11.ebuild
+++ b/sys-apps/ivman/ivman-0.6.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.6.11.ebuild,v 1.7 2006/08/05 15:17:19 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.6.14.ebuild,v 1.1 2007/03/06 15:02:24 genstef Exp $
inherit eutils
@@ -8,7 +8,7 @@ DESCRIPTION="Daemon to mount/unmount devices, based on info from HAL"
HOMEPAGE="http://ivman.sf.net"
SRC_URI="mirror://sourceforge/ivman/${P}.tar.bz2"
LICENSE="GPL-2 QPL"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
SLOT="0"
@@ -22,13 +22,21 @@ DEPEND="${RDEPEND}
>=sys-devel/libtool-1.5
dev-util/pkgconfig"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # Add support for hotpluggable devices (not removable)
+ epatch "${FILESDIR}"/${PN}-0.6-hotpluggable.patch
+}
+
src_compile() {
econf $(use_enable debug) || die "econf failed"
emake || die "emake failed"
}
src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install || die "emake install failed"
exeinto /etc/init.d/
newexe ${FILESDIR}/ivman-0.3.init ivman