diff options
Diffstat (limited to 'gnome-base/gnome-volume-manager')
6 files changed, 22 insertions, 131 deletions
diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog index c4dbfde765d5..8c717f475320 100644 --- a/gnome-base/gnome-volume-manager/ChangeLog +++ b/gnome-base/gnome-volume-manager/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-volume-manager # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.112 2008/09/25 14:52:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.113 2008/10/19 10:09:54 eva Exp $ + + 19 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> metadata.xml, + -gnome-volume-manager-2.17.0.ebuild, + gnome-volume-manager-2.17.0-r1.ebuild, + -gnome-volume-manager-2.22.1.ebuild, gnome-volume-manager-2.22.5.ebuild: + Add consolekit use flag per bug #242384. Fix some repoman warnings. + Clean up old revisions. 25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gnome-volume-manager-2.22.5.ebuild: diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild index 9e9ecaa5d7f5..c0d8487eb4bd 100644 --- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild +++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-2.17.0-r1.ebuild,v 1.10 2008/06/05 11:55:09 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0-r1.ebuild,v 1.11 2008/10/19 10:09:54 eva Exp $ inherit gnome2 eutils autotools @@ -54,6 +54,7 @@ src_unpack() { # fix LINGUAS handling, bug #183086 intltoolize --force || die "intltoolize failed" + eautoreconf } pkg_postinst() { diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild deleted file mode 100644 index 5c6ec21e3dce..000000000000 --- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.17.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2008 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-2.17.0.ebuild,v 1.15 2008/06/05 11:55:09 remi Exp $ - -inherit gnome2 eutils autotools - -DESCRIPTION="Daemon that enforces volume-related policies" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="crypt debug doc" - -RDEPEND="gnome-base/nautilus - >=gnome-base/libgnomeui-2.1.5 - >=dev-libs/dbus-glib-0.71 - >=sys-apps/hal-0.5.6 - >=x11-libs/gtk+-2.6 - >=gnome-base/libglade-2 - >=x11-libs/libnotify-0.3 - >=gnome-base/gconf-2 - >=gnome-base/gnome-control-center-2.0 - gnome-base/gnome-mime-data - gnome-base/gnome-mount" - -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.20 - >=dev-util/intltool-0.35" - -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 - - # fbsd fixes. bug #183442 - epatch "${FILESDIR}"/${P}-fbsd.patch -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "To start the gnome-volume-manager daemon you need to configure" - elog "it through it's preferences capplet. Also the HAL daemon (hald)" - elog "needs to be running or it will shut down." -} diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.1.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.1.ebuild deleted file mode 100644 index 046b0846488a..000000000000 --- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 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-2.22.1.ebuild,v 1.2 2008/05/14 16:34:02 corsair Exp $ - -inherit gnome2 eutils - -DESCRIPTION="Daemon that enforces volume-related policies" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86" # ~x86-fbsd" -IUSE="debug" - -# TODO: libnotify support is optional but doesn't have a configure switch - -RDEPEND=">=gnome-base/libgnomeui-2.1.5 - >=dev-libs/dbus-glib-0.71 - >=sys-apps/hal-0.5.9 - >=x11-libs/gtk+-2.6 - >=gnome-base/libglade-2 - >=x11-libs/libnotify-0.3 - >=gnome-base/gconf-2 - - gnome-base/nautilus - >=gnome-base/gnome-mount-0.6" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.20 - >=dev-util/intltool-0.35" - -DOCS="AUTHORS ChangeLog README HACKING NEWS TODO" - -pkg_setup() { - G2CONF="${G2CONF} $(use_enable debug)" - - # 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 - # FIXME: now that we have pambase, find time to check if we can do this - G2CONF="${G2CONF} --disable-multiuser" -} - -src_unpack() { - gnome2_src_unpack - - # Fix most FreeBSD issues (bug #183442) -- local fallback wont work - epatch "${FILESDIR}"/${PN}-2.22.0-fbsd-support.patch - - # Fix default totem command. Bug #200999 - epatch "${FILESDIR}"/${PN}-2.17.0-totem-dvd.patch -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "To start the gnome-volume-manager daemon you need to configure" - elog "it through it's preferences capplet. Also the HAL daemon (hald)" - elog "needs to be running or it will shut down." -} diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild index 8094cd4220be..b28453c781e0 100644 --- a/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild +++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-2.22.5.ebuild,v 1.6 2008/09/25 14:52:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-2.22.5.ebuild,v 1.7 2008/10/19 10:09:54 eva Exp $ inherit gnome2 eutils @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~sh sparc x86" # ~x86-fbsd" -IUSE="automount debug" +IUSE="automount debug consolekit" # TODO: libnotify support is optional but doesn't have a configure switch @@ -23,7 +23,9 @@ RDEPEND=">=gnome-base/libgnomeui-2.1.5 >=gnome-base/gconf-2 gnome-base/nautilus - >=gnome-base/gnome-mount-0.6" + >=gnome-base/gnome-mount-0.6 + + consolekit? ( >=sys-auth/consolekit-0.2 )" DEPEND="${RDEPEND} sys-devel/gettext >=dev-util/pkgconfig-0.20 @@ -32,13 +34,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog README HACKING NEWS TODO" pkg_setup() { - G2CONF="${G2CONF} $(use_enable debug) $(use_enable automount)" - - # 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 - # FIXME: now that we have pambase, find time to check if we can do this - G2CONF="${G2CONF} --disable-multiuser" + # if consolekit is absent, g-v-m will fall back to the old + # behavior of the pam_console time. + G2CONF="${G2CONF} + $(use_enable debug) + $(use_enable automount) + $(use_enable consolekit multiuser)" } src_unpack() { diff --git a/gnome-base/gnome-volume-manager/metadata.xml b/gnome-base/gnome-volume-manager/metadata.xml index db5c08c82e24..56e3d4db51ec 100644 --- a/gnome-base/gnome-volume-manager/metadata.xml +++ b/gnome-base/gnome-volume-manager/metadata.xml @@ -6,5 +6,6 @@ <flag name="automount">Enable support for automounting devices that are handled by <pkg>gnome-base/nautilus</pkg> since 2.22. This should be off on most Gnome systems.</flag> + <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> to determine policy on removable media.</flag> </use> </pkgmetadata> |