From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/
Date: Fri, 25 Feb 2011 19:42:03 +0000 (UTC) [thread overview]
Message-ID: <eba193c240616f3068a6951537c967578041f7b4.nirbheek@gentoo> (raw)
commit: eba193c240616f3068a6951537c967578041f7b4
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 02:40:06 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 19:41:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eba193c2
net-misc/vinagre: 2.91.7 -> 2.91.8, update live version
* Ported to gsettings
---
...vinagre-2.91.7.ebuild => vinagre-2.91.8.ebuild} | 31 +++++++++++---------
net-misc/vinagre/vinagre-9999.ebuild | 31 +++++++++++---------
2 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/net-misc/vinagre/vinagre-2.91.7.ebuild b/net-misc/vinagre/vinagre-2.91.8.ebuild
similarity index 72%
rename from net-misc/vinagre/vinagre-2.91.7.ebuild
rename to net-misc/vinagre/vinagre-2.91.8.ebuild
index 82e860c..5f4439d 100644
--- a/net-misc/vinagre/vinagre-2.91.7.ebuild
+++ b/net-misc/vinagre/vinagre-2.91.8.ebuild
@@ -2,18 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.4 2011/01/19 21:26:57 hwoarang Exp $
-EAPI="2"
+EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2 virtualx
+inherit gnome2 virtualx
DESCRIPTION="VNC Client for the GNOME Desktop"
HOMEPAGE="http://www.gnome.org/projects/vinagre/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi +introspection +ssh +telepathy test" #applet
+IUSE="avahi +introspection +ssh +telepathy test" #applet spice
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -22,19 +22,19 @@ else
fi
RDEPEND=">=dev-libs/glib-2.25.11:2
- dev-libs/dbus-glib
- >=x11-libs/gtk+-2.99.3:3
- >=gnome-base/gconf-2.16:2
+ >=x11-libs/gtk+-2.99.3:3
>=dev-libs/libpeas-0.7.2[gtk]
>=dev-libs/libxml2-2.6.31:2
- >=net-libs/gtk-vnc-0.4.3:0
+ >=net-libs/gtk-vnc-0.4.3-r300
gnome-base/gnome-keyring
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
ssh? ( >=x11-libs/vte-0.20:2.90 )
- telepathy? ( >=net-libs/telepathy-glib-0.11.6 )"
+ telepathy? (
+ dev-libs/dbus-glib
+ >=net-libs/telepathy-glib-0.11.6 )"
#applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )
DEPEND="${RDEPEND}
gnome-base/gnome-common
@@ -49,9 +49,12 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
src_prepare() {
# Applet doesn't work with GNOME 3: gnome bug 642707
+ # Spice support?
G2CONF="${G2CONF}
+ --disable-schemas-compile
--disable-scrollkeeper
--disable-applet
+ --disable-spice
--enable-rdp
$(use_enable avahi)
$(use_enable introspection)
@@ -62,17 +65,17 @@ 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.
+ # Dbus is needed for introspection because it runs vinagre.
# Hence, we need X. But that's okay, because dbus auto-exits after a while.
- Xemake || die
+ # Also, we need the schemas from data/ to run the app for introspection.
+ local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
+ ${updater} --allow-any-name "${S}/data" || die
+ GSETTINGS_SCHEMA_DIR=${S}/data Xemake || die
}
src_install() {
gnome2_src_install
# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
- rm -rf "${D}"/usr/share/doc/vinagre
+ rm -rf "${ED}"/usr/share/doc/vinagre
}
diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index 82e860c..5f4439d 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -2,18 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.4 2011/01/19 21:26:57 hwoarang Exp $
-EAPI="2"
+EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2 virtualx
+inherit gnome2 virtualx
DESCRIPTION="VNC Client for the GNOME Desktop"
HOMEPAGE="http://www.gnome.org/projects/vinagre/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi +introspection +ssh +telepathy test" #applet
+IUSE="avahi +introspection +ssh +telepathy test" #applet spice
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -22,19 +22,19 @@ else
fi
RDEPEND=">=dev-libs/glib-2.25.11:2
- dev-libs/dbus-glib
- >=x11-libs/gtk+-2.99.3:3
- >=gnome-base/gconf-2.16:2
+ >=x11-libs/gtk+-2.99.3:3
>=dev-libs/libpeas-0.7.2[gtk]
>=dev-libs/libxml2-2.6.31:2
- >=net-libs/gtk-vnc-0.4.3:0
+ >=net-libs/gtk-vnc-0.4.3-r300
gnome-base/gnome-keyring
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
ssh? ( >=x11-libs/vte-0.20:2.90 )
- telepathy? ( >=net-libs/telepathy-glib-0.11.6 )"
+ telepathy? (
+ dev-libs/dbus-glib
+ >=net-libs/telepathy-glib-0.11.6 )"
#applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )
DEPEND="${RDEPEND}
gnome-base/gnome-common
@@ -49,9 +49,12 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
src_prepare() {
# Applet doesn't work with GNOME 3: gnome bug 642707
+ # Spice support?
G2CONF="${G2CONF}
+ --disable-schemas-compile
--disable-scrollkeeper
--disable-applet
+ --disable-spice
--enable-rdp
$(use_enable avahi)
$(use_enable introspection)
@@ -62,17 +65,17 @@ 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.
+ # Dbus is needed for introspection because it runs vinagre.
# Hence, we need X. But that's okay, because dbus auto-exits after a while.
- Xemake || die
+ # Also, we need the schemas from data/ to run the app for introspection.
+ local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
+ ${updater} --allow-any-name "${S}/data" || die
+ GSETTINGS_SCHEMA_DIR=${S}/data Xemake || die
}
src_install() {
gnome2_src_install
# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
- rm -rf "${D}"/usr/share/doc/vinagre
+ rm -rf "${ED}"/usr/share/doc/vinagre
}
next reply other threads:[~2011-02-25 19:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-25 19:42 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:40 [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/ Dennis Lamm
2016-04-02 16:34 Ole Reifschneider
2015-05-12 18:44 Gilles Dartiguelongue
2015-05-08 23:36 Gilles Dartiguelongue
2014-12-26 21:48 Gilles Dartiguelongue
2014-12-21 13:28 Gilles Dartiguelongue
2014-11-23 22:27 Gilles Dartiguelongue
2014-10-13 21:51 Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2014-04-06 18:22 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-12 23:20 Gilles Dartiguelongue
2013-12-01 23:18 Gilles Dartiguelongue
2013-11-14 22:52 Gilles Dartiguelongue
2013-01-07 13:45 Alexandre Rostovtsev
2012-12-18 22:53 Gilles Dartiguelongue
2012-11-21 23:07 Gilles Dartiguelongue
2012-10-28 18:10 Gilles Dartiguelongue
2012-09-22 18:03 Nirbheek Chauhan
2012-09-11 9:24 Nirbheek Chauhan
2012-05-24 9:12 Alexandre Restovtsev
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-26 1:58 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-02-19 17:46 Nirbheek Chauhan
2011-02-19 10:54 Priit Laes
2011-02-19 8:33 Priit Laes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eba193c240616f3068a6951537c967578041f7b4.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox