From 0016fe7fd3b141f8ca3add2986663a4b32d38446 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 2 Aug 2009 10:52:32 +0000 Subject: Version bump. Fix autorestart loop when session-saving is enabled, bug #277989. Clean up old revision. Fix locales installation. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- net-misc/vino/ChangeLog | 9 ++- .../vino/files/vino-2.26.2-autorestart-loop.patch | 14 +++++ net-misc/vino/vino-2.26.1.ebuild | 63 --------------------- net-misc/vino/vino-2.26.2-r1.ebuild | 66 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 64 deletions(-) create mode 100644 net-misc/vino/files/vino-2.26.2-autorestart-loop.patch delete mode 100644 net-misc/vino/vino-2.26.1.ebuild create mode 100644 net-misc/vino/vino-2.26.2-r1.ebuild (limited to 'net-misc/vino') diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog index d0625ca81fb8..9bd8409cd60c 100644 --- a/net-misc/vino/ChangeLog +++ b/net-misc/vino/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/vino # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.124 2009/05/18 21:28:03 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.125 2009/08/02 10:52:31 eva Exp $ + +*vino-2.26.2-r1 (02 Aug 2009) + + 02 Aug 2009; Gilles Dartiguelongue -vino-2.26.1.ebuild, + +vino-2.26.2-r1.ebuild, +files/vino-2.26.2-autorestart-loop.patch: + Version bump. Fix autorestart loop when session-saving is enabled, bug + #277989. Clean up old revision. Fix locales installation. *vino-2.26.2 (18 May 2009) diff --git a/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch b/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch new file mode 100644 index 000000000000..a2bce1871ce6 --- /dev/null +++ b/net-misc/vino/files/vino-2.26.2-autorestart-loop.patch @@ -0,0 +1,14 @@ +# Disallow vino-server to register into the session since it is auto-started. +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=277989 +# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=579355 +--- a/server/vino-server.desktop.in.in 2009-03-23 22:17:35.647373307 +0100 ++++ b/server/vino-server.desktop.in.in 2009-03-23 22:17:53.079875343 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Remote Desktop + _Comment=GNOME Remote Desktop Server +-Exec=@LIBEXECDIR@/vino-server ++Exec=@LIBEXECDIR@/vino-server --sm-disable + Icon=preferences-desktop-remote-desktop + OnlyShowIn=GNOME; + Terminal=false diff --git a/net-misc/vino/vino-2.26.1.ebuild b/net-misc/vino/vino-2.26.1.ebuild deleted file mode 100644 index 07d8e72b457d..000000000000 --- a/net-misc/vino/vino-2.26.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.1.ebuild,v 1.4 2009/05/16 13:25:34 aballier Exp $ - -EAPI="2" - -inherit eutils gnome2 - -DESCRIPTION="An integrated VNC server for GNOME" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib" - -RDEPEND=">=dev-libs/glib-2.17 - >=x11-libs/gtk+-2.13.1 - >=gnome-base/libgnomeui-2 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=sys-apps/dbus-1.2.3 - >=net-libs/libsoup-2.24.0:2.4 - >=dev-libs/libunique-1.0.0 - dev-libs/dbus-glib - x11-libs/libXext - x11-libs/libXtst - libnotify? ( >=x11-libs/libnotify-0.4.4 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 ) - avahi? ( >=net-dns/avahi-0.6[dbus] ) - crypt? ( >=dev-libs/libgcrypt-1.1.90 ) - gnutls? ( >=net-libs/gnutls-1 ) - jpeg? ( media-libs/jpeg ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35" - -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable avahi) - $(use_enable crypt gcrypt) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_with jpeg) - $(use_enable gnome-keyring) - $(use_enable libnotify) - $(use_enable networkmanager network-manager) - $(use_with zlib) - $(use_with zlib libz) - --enable-libunique" -} - -src_prepare() { - gnome2_src_prepare - - # Fix build issue on fbsd, upstream bug #577831 - epatch "${FILESDIR}/${P}-fbsd-fix.patch" -} diff --git a/net-misc/vino/vino-2.26.2-r1.ebuild b/net-misc/vino/vino-2.26.2-r1.ebuild new file mode 100644 index 000000000000..f256f179b86c --- /dev/null +++ b/net-misc/vino/vino-2.26.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.1 2009/08/02 10:52:31 eva Exp $ + +EAPI="2" + +inherit eutils gnome2 + +DESCRIPTION="An integrated VNC server for GNOME" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib" + +RDEPEND=">=dev-libs/glib-2.17 + >=x11-libs/gtk+-2.13.1 + >=gnome-base/libgnomeui-2 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=sys-apps/dbus-1.2.3 + >=net-libs/libsoup-2.24.0:2.4 + >=dev-libs/libunique-1.0.0 + dev-libs/dbus-glib + x11-libs/libXext + x11-libs/libXtst + libnotify? ( >=x11-libs/libnotify-0.4.4 ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) + crypt? ( >=dev-libs/libgcrypt-1.1.90 ) + gnutls? ( >=net-libs/gnutls-1 ) + jpeg? ( media-libs/jpeg ) + networkmanager? ( >=net-misc/networkmanager-0.7 ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35" + +DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable avahi) + $(use_enable crypt gcrypt) + $(use_enable gnutls) + $(use_enable ipv6) + $(use_with jpeg) + $(use_enable gnome-keyring) + $(use_enable libnotify) + $(use_enable networkmanager network-manager) + $(use_with zlib) + $(use_with zlib libz) + --enable-libunique" +} + +src_prepare() { + gnome2_src_prepare + + # Fix autorestart loop, bug #277989 + epatch "${FILESDIR}/${P}-autorestart-loop.patch" + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" +} -- cgit v1.2.3-65-gdbad