From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pqqt7-00058A-Ew for garchives@archives.gentoo.org; Sat, 19 Feb 2011 17:46:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFCC1C026; Sat, 19 Feb 2011 17:46:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F8431C026 for ; Sat, 19 Feb 2011 17:46:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6F7E1B4368 for ; Sat, 19 Feb 2011 17:46:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1BCBC8006E for ; Sat, 19 Feb 2011 17:46:25 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/vinagre/vinagre-2.91.7.ebuild net-misc/vinagre/vinagre-9999.ebuild X-VCS-Directories: net-misc/vinagre/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: e086c8c93ef79c41dda025ebbcbc7208d54a5efa Date: Sat, 19 Feb 2011 17:46:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f5ec05a7e81138627e6d4d15d2f5d27f commit: e086c8c93ef79c41dda025ebbcbc7208d54a5efa Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Feb 19 14:17:57 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Feb 19 17:45:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De086c8c9 net-misc/vinagre: various fixes. * Fix automagic introspection, explicitly enable rdp support. * Re-add[[ ${PV} =3D 9999 ]] conditional, all overlay ebuilds should have= this. - This way you can often just copy the ebuild over to -9999 after a bum= p * SRC_URI does not fetch from git repositories. * Collection of introspection data requires the application to be run, wh= ich needs GConf and dbus. So we need to run Xemake. * Port to latest libpeas, added by plaes to overlay. * Disable applet support, it's broken with latest gnome-panel. - It also has no place in GNOME 3. --- net-misc/vinagre/vinagre-2.91.7.ebuild | 35 +++++++++++++++++++++-----= ----- net-misc/vinagre/vinagre-9999.ebuild | 33 ++++++++++++++++++++------= ---- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/net-misc/vinagre/vinagre-2.91.7.ebuild b/net-misc/vinagre/vi= nagre-2.91.7.ebuild index a715376..82e860c 100644 --- a/net-misc/vinagre/vinagre-2.91.7.ebuild +++ b/net-misc/vinagre/vinagre-2.91.7.ebuild @@ -1,20 +1,25 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuil= d,v 1.6 2011/01/30 19:10:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuil= d,v 1.4 2011/01/19 21:26:57 hwoarang Exp $ =20 EAPI=3D"2" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 +inherit eutils gnome2 virtualx =20 DESCRIPTION=3D"VNC Client for the GNOME Desktop" HOMEPAGE=3D"http://www.gnome.org/projects/vinagre/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE=3D"applet avahi +ssh +telepathy test" +IUSE=3D"avahi +introspection +ssh +telepathy test" #applet +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live + KEYWORDS=3D"" +else + KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +fi =20 RDEPEND=3D">=3Ddev-libs/glib-2.25.11:2 dev-libs/dbus-glib @@ -26,11 +31,11 @@ RDEPEND=3D">=3Ddev-libs/glib-2.25.11:2 =20 gnome-base/gnome-keyring =20 - applet? ( || ( gnome-base/gnome-panel[bonobo] =3Dnet-dns/avahi-0.6.26[dbus,gtk3] ) + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 ) ssh? ( >=3Dx11-libs/vte-0.20:2.90 ) telepathy? ( >=3Dnet-libs/telepathy-glib-0.11.6 )" - + #applet? ( || ( gnome-base/gnome-panel[bonobo] =3Ddev-lang/perl-5 @@ -40,21 +45,29 @@ DEPEND=3D"${RDEPEND} app-text/gnome-doc-utils test? ( ~app-text/docbook-xml-dtd-4.3 )" =20 -pkg_setup() { - DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README" +DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README" + +src_prepare() { + # Applet doesn't work with GNOME 3: gnome bug 642707 G2CONF=3D"${G2CONF} --disable-scrollkeeper + --disable-applet + --enable-rdp $(use_enable avahi) - $(use_enable applet) + $(use_enable introspection) $(use_enable ssh) $(use_enable telepathy)" + + gnome2_src_prepare } =20 src_compile() { - # XXX: This sucks :S + # GConf sucks. Thankfully it's going away: gnome bug 625895 addpredict "$(unset HOME; echo ~)/.gconf" addpredict "$(unset HOME; echo ~)/.gconfd" - gnome2_src_compile + # Dbus is needed for introspection because it runs vinagre, which needs= GConf. + # Hence, we need X. But that's okay, because dbus auto-exits after a wh= ile. + Xemake || die } =20 src_install() { diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vina= gre-9999.ebuild index 06e4c3d..82e860c 100644 --- a/net-misc/vinagre/vinagre-9999.ebuild +++ b/net-misc/vinagre/vinagre-9999.ebuild @@ -6,15 +6,14 @@ EAPI=3D"2" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 +inherit eutils gnome2 virtualx =20 DESCRIPTION=3D"VNC Client for the GNOME Desktop" HOMEPAGE=3D"http://www.gnome.org/projects/vinagre/" -SRC_URI=3D"git://git.gnome.org/vinagre" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"applet avahi +introspection +ssh +telepathy test" +IUSE=3D"avahi +introspection +ssh +telepathy test" #applet if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -22,22 +21,21 @@ else KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi =20 -RDEPEND=3D">=3Ddev-libs/glib-2.25.11 +RDEPEND=3D">=3Ddev-libs/glib-2.25.11:2 dev-libs/dbus-glib >=3Dx11-libs/gtk+-2.99.3:3 - >=3Dgnome-base/gconf-2.16 + >=3Dgnome-base/gconf-2.16:2 >=3Ddev-libs/libpeas-0.7.2[gtk] - >=3Ddev-libs/libxml2-2.6.31 - >=3Dnet-libs/gtk-vnc-0.4.3:3 + >=3Ddev-libs/libxml2-2.6.31:2 + >=3Dnet-libs/gtk-vnc-0.4.3:0 =20 gnome-base/gnome-keyring =20 - applet? ( || ( gnome-base/gnome-panel[bonobo] =3Dnet-dns/avahi-0.6.26[dbus,gtk3] ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 ) ssh? ( >=3Dx11-libs/vte-0.20:2.90 ) telepathy? ( >=3Dnet-libs/telepathy-glib-0.11.6 )" - + #applet? ( || ( gnome-base/gnome-panel[bonobo] =3Ddev-lang/perl-5 @@ -49,14 +47,27 @@ DEPEND=3D"${RDEPEND} =20 DOCS=3D"AUTHORS ChangeLog MAINTAINERS NEWS README" =20 -pkg_setup() { +src_prepare() { + # Applet doesn't work with GNOME 3: gnome bug 642707 G2CONF=3D"${G2CONF} --disable-scrollkeeper + --disable-applet --enable-rdp $(use_enable avahi) - $(use_enable applet) + $(use_enable introspection) $(use_enable ssh) $(use_enable telepathy)" + + gnome2_src_prepare +} + +src_compile() { + # GConf sucks. Thankfully it's going away: gnome bug 625895 + addpredict "$(unset HOME; echo ~)/.gconf" + addpredict "$(unset HOME; echo ~)/.gconfd" + # Dbus is needed for introspection because it runs vinagre, which needs= GConf. + # Hence, we need X. But that's okay, because dbus auto-exits after a wh= ile. + Xemake || die } =20 src_install() {