remove --sm-disable from autostart file, fixes #140040

(Portage version: 2.1.1_pre2-r6)

3 files changed, 81 insertions, 1 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 9e29e82e4f72..7e183e78ee47 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.58 2006/07/17 18:04:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.59 2006/07/20 19:48:01 allanonjl Exp $
+
+*gnome-volume-manager-1.5.15-r3 (20 Jul 2006)
+
+  20 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +gnome-volume-manager-1.5.15-r3.ebuild:
+  remove --sm-disable from autostart file, fixes #140040
 
   17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
   gnome-volume-manager-1.5.15-r2.ebuild:
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r3 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r3
new file mode 100644
index 000000000000..fba69291efd5
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r3
@@ -0,0 +1,3 @@
+MD5 0bf3ee007c951a5d833a3c17bbe59ec6 gnome-volume-manager-1.5.15.tar.bz2 311956
+RMD160 b179d3ea4fb6cc8fd1166f5e409d5e2d06c98b7e gnome-volume-manager-1.5.15.tar.bz2 311956
+SHA256 c346d7f47bc3194c96f62376b006e6c111963d3b697f2c92fbd13da34f04f19b gnome-volume-manager-1.5.15.tar.bz2 311956
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r3.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r3.ebuild
new file mode 100644
index 000000000000..92e84b832be5
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r3.ebuild,v 1.1 2006/07/20 19:48:01 allanonjl Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug doc"
+
+RDEPEND="gnome-base/nautilus
+	sys-devel/gettext
+	>=gnome-base/libgnomeui-2.1.5
+	>=sys-apps/dbus-0.31
+	>=sys-apps/hal-0.5.6
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2
+	>=gnome-base/control-center-2.0
+	gnome-base/gnome-mime-data
+	gnome-base/gnome-mount"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.27.2"
+
+DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+			$(use_enable crypt) \
+			$(use_enable debug) \
+			$(use_enable doc)"
+
+	# FIXME: We should be more intelligent about disabling multiuser support
+	# (like enable it when pam_console is available?). For now, this is a
+	# slightly nicer solution than applying ${PN}-1.5.9-no-pam_console.patch
+	G2CONF="${G2CONF} --disable-multiuser"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Hard disable the libnotify support as it was not tested sufficiently.
+	# Drop this patch with the 2.16 cycle
+	epatch ${FILESDIR}/${PN}-1.5.15-no-libnotify.patch
+
+	# disable dvd playback in totem since it doesn't work.
+	epatch "${FILESDIR}"/disable-totem-dvd-autoplay.patch
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# fix for bug #140040
+	sed -i -e 's: --sm-disable::' ${D}/usr/share/gnome/autostart/gnome-volume-manager.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "To start the gnome-volume-manager daemon you need to configure"
+	einfo "it through it's preferences capplet. Also the HAL daemon (hald)"
+	einfo "needs to be running or it will shut down."
+}