hard disable libnotify due to lack of testing

(Portage version: 2.1_pre10-r2)

4 files changed, 94 insertions, 1 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index a707e34d020b..0b2740f4e1c1 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,14 @@
 # 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.50 2006/04/27 20:15:23 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.51 2006/05/04 06:09:50 compnerd Exp $
+
+*gnome-volume-manager-1.5.15-r1 (04 May 2006)
+
+  04 May 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-volume-manager-1.5.15-no-libnotify.patch,
+  +gnome-volume-manager-1.5.15-r1.ebuild:
+  Hard disable libnotify support due to lack of testing, to be re-enabled with
+  the 2.16 cycle
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-gnome-volume-manager-1.2.1,
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r1 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r1
new file mode 100644
index 000000000000..fba69291efd5
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.5.15-r1
@@ -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/files/gnome-volume-manager-1.5.15-no-libnotify.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.15-no-libnotify.patch
new file mode 100644
index 000000000000..868fa801e68e
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.15-no-libnotify.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig	2006-05-04 00:49:06.000000000 -0500
++++ configure.in	2006-05-04 00:50:20.000000000 -0500
+@@ -109,12 +109,13 @@
+ AC_SUBST(CAPPLET_CFLAGS)
+ AC_SUBST(CAPPLET_LIBS)
+ 
+-PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
+-			    [enable_notify=no])
+-if test "x$enable_notify" != "xno"; then
+-   AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], 1,
+-   [Enable notifications with libnotify])
+-fi
++dnl Hard disable libnotify on Gentoo for the 2.14 release
++dnl PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
++dnl 			    [enable_notify=no])
++dnl if test "x$enable_notify" != "xno"; then
++dnl   AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], 1,
++dnl    [Enable notifications with libnotify])
++dnl fi
+ 
+ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ AM_GCONF_SOURCE_2
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r1.ebuild
new file mode 100644
index 000000000000..ee64193f741a
--- /dev/null
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.5.15-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-r1.ebuild,v 1.1 2006/05/04 06:09:50 compnerd Exp $
+
+inherit gnome2
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+	unpack ${A}
+	cd ${S}
+
+	# 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
+
+	# Sine we override the src_unpack, we must call this
+	gnome2_omf_fix
+}
+
+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."
+}