| 1 |
commit: eba193c240616f3068a6951537c967578041f7b4 |
| 2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 25 02:40:06 2011 +0000 |
| 4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 25 19:41:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eba193c2 |
| 7 |
|
| 8 |
net-misc/vinagre: 2.91.7 -> 2.91.8, update live version |
| 9 |
|
| 10 |
* Ported to gsettings |
| 11 |
|
| 12 |
--- |
| 13 |
...vinagre-2.91.7.ebuild => vinagre-2.91.8.ebuild} | 31 +++++++++++--------- |
| 14 |
net-misc/vinagre/vinagre-9999.ebuild | 31 +++++++++++--------- |
| 15 |
2 files changed, 34 insertions(+), 28 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/vinagre/vinagre-2.91.7.ebuild b/net-misc/vinagre/vinagre-2.91.8.ebuild |
| 18 |
similarity index 72% |
| 19 |
rename from net-misc/vinagre/vinagre-2.91.7.ebuild |
| 20 |
rename to net-misc/vinagre/vinagre-2.91.8.ebuild |
| 21 |
index 82e860c..5f4439d 100644 |
| 22 |
--- a/net-misc/vinagre/vinagre-2.91.7.ebuild |
| 23 |
+++ b/net-misc/vinagre/vinagre-2.91.8.ebuild |
| 24 |
@@ -2,18 +2,18 @@ |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.4 2011/01/19 21:26:57 hwoarang Exp $ |
| 27 |
|
| 28 |
-EAPI="2" |
| 29 |
+EAPI="3" |
| 30 |
GCONF_DEBUG="no" |
| 31 |
GNOME2_LA_PUNT="yes" |
| 32 |
|
| 33 |
-inherit eutils gnome2 virtualx |
| 34 |
+inherit gnome2 virtualx |
| 35 |
|
| 36 |
DESCRIPTION="VNC Client for the GNOME Desktop" |
| 37 |
HOMEPAGE="http://www.gnome.org/projects/vinagre/" |
| 38 |
|
| 39 |
LICENSE="GPL-2" |
| 40 |
SLOT="0" |
| 41 |
-IUSE="avahi +introspection +ssh +telepathy test" #applet |
| 42 |
+IUSE="avahi +introspection +ssh +telepathy test" #applet spice |
| 43 |
if [[ ${PV} = 9999 ]]; then |
| 44 |
inherit gnome2-live |
| 45 |
KEYWORDS="" |
| 46 |
@@ -22,19 +22,19 @@ else |
| 47 |
fi |
| 48 |
|
| 49 |
RDEPEND=">=dev-libs/glib-2.25.11:2 |
| 50 |
- dev-libs/dbus-glib |
| 51 |
- >=x11-libs/gtk+-2.99.3:3 |
| 52 |
- >=gnome-base/gconf-2.16:2 |
| 53 |
+ >=x11-libs/gtk+-2.99.3:3 |
| 54 |
>=dev-libs/libpeas-0.7.2[gtk] |
| 55 |
>=dev-libs/libxml2-2.6.31:2 |
| 56 |
- >=net-libs/gtk-vnc-0.4.3:0 |
| 57 |
+ >=net-libs/gtk-vnc-0.4.3-r300 |
| 58 |
|
| 59 |
gnome-base/gnome-keyring |
| 60 |
|
| 61 |
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) |
| 62 |
introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) |
| 63 |
ssh? ( >=x11-libs/vte-0.20:2.90 ) |
| 64 |
- telepathy? ( >=net-libs/telepathy-glib-0.11.6 )" |
| 65 |
+ telepathy? ( |
| 66 |
+ dev-libs/dbus-glib |
| 67 |
+ >=net-libs/telepathy-glib-0.11.6 )" |
| 68 |
#applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
gnome-base/gnome-common |
| 71 |
@@ -49,9 +49,12 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
# Applet doesn't work with GNOME 3: gnome bug 642707 |
| 75 |
+ # Spice support? |
| 76 |
G2CONF="${G2CONF} |
| 77 |
+ --disable-schemas-compile |
| 78 |
--disable-scrollkeeper |
| 79 |
--disable-applet |
| 80 |
+ --disable-spice |
| 81 |
--enable-rdp |
| 82 |
$(use_enable avahi) |
| 83 |
$(use_enable introspection) |
| 84 |
@@ -62,17 +65,17 @@ src_prepare() { |
| 85 |
} |
| 86 |
|
| 87 |
src_compile() { |
| 88 |
- # GConf sucks. Thankfully it's going away: gnome bug 625895 |
| 89 |
- addpredict "$(unset HOME; echo ~)/.gconf" |
| 90 |
- addpredict "$(unset HOME; echo ~)/.gconfd" |
| 91 |
- # Dbus is needed for introspection because it runs vinagre, which needs GConf. |
| 92 |
+ # Dbus is needed for introspection because it runs vinagre. |
| 93 |
# Hence, we need X. But that's okay, because dbus auto-exits after a while. |
| 94 |
- Xemake || die |
| 95 |
+ # Also, we need the schemas from data/ to run the app for introspection. |
| 96 |
+ local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}" |
| 97 |
+ ${updater} --allow-any-name "${S}/data" || die |
| 98 |
+ GSETTINGS_SCHEMA_DIR=${S}/data Xemake || die |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
gnome2_src_install |
| 103 |
|
| 104 |
# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed |
| 105 |
- rm -rf "${D}"/usr/share/doc/vinagre |
| 106 |
+ rm -rf "${ED}"/usr/share/doc/vinagre |
| 107 |
} |
| 108 |
|
| 109 |
diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild |
| 110 |
index 82e860c..5f4439d 100644 |
| 111 |
--- a/net-misc/vinagre/vinagre-9999.ebuild |
| 112 |
+++ b/net-misc/vinagre/vinagre-9999.ebuild |
| 113 |
@@ -2,18 +2,18 @@ |
| 114 |
# Distributed under the terms of the GNU General Public License v2 |
| 115 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.4 2011/01/19 21:26:57 hwoarang Exp $ |
| 116 |
|
| 117 |
-EAPI="2" |
| 118 |
+EAPI="3" |
| 119 |
GCONF_DEBUG="no" |
| 120 |
GNOME2_LA_PUNT="yes" |
| 121 |
|
| 122 |
-inherit eutils gnome2 virtualx |
| 123 |
+inherit gnome2 virtualx |
| 124 |
|
| 125 |
DESCRIPTION="VNC Client for the GNOME Desktop" |
| 126 |
HOMEPAGE="http://www.gnome.org/projects/vinagre/" |
| 127 |
|
| 128 |
LICENSE="GPL-2" |
| 129 |
SLOT="0" |
| 130 |
-IUSE="avahi +introspection +ssh +telepathy test" #applet |
| 131 |
+IUSE="avahi +introspection +ssh +telepathy test" #applet spice |
| 132 |
if [[ ${PV} = 9999 ]]; then |
| 133 |
inherit gnome2-live |
| 134 |
KEYWORDS="" |
| 135 |
@@ -22,19 +22,19 @@ else |
| 136 |
fi |
| 137 |
|
| 138 |
RDEPEND=">=dev-libs/glib-2.25.11:2 |
| 139 |
- dev-libs/dbus-glib |
| 140 |
- >=x11-libs/gtk+-2.99.3:3 |
| 141 |
- >=gnome-base/gconf-2.16:2 |
| 142 |
+ >=x11-libs/gtk+-2.99.3:3 |
| 143 |
>=dev-libs/libpeas-0.7.2[gtk] |
| 144 |
>=dev-libs/libxml2-2.6.31:2 |
| 145 |
- >=net-libs/gtk-vnc-0.4.3:0 |
| 146 |
+ >=net-libs/gtk-vnc-0.4.3-r300 |
| 147 |
|
| 148 |
gnome-base/gnome-keyring |
| 149 |
|
| 150 |
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) |
| 151 |
introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) |
| 152 |
ssh? ( >=x11-libs/vte-0.20:2.90 ) |
| 153 |
- telepathy? ( >=net-libs/telepathy-glib-0.11.6 )" |
| 154 |
+ telepathy? ( |
| 155 |
+ dev-libs/dbus-glib |
| 156 |
+ >=net-libs/telepathy-glib-0.11.6 )" |
| 157 |
#applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) |
| 158 |
DEPEND="${RDEPEND} |
| 159 |
gnome-base/gnome-common |
| 160 |
@@ -49,9 +49,12 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" |
| 161 |
|
| 162 |
src_prepare() { |
| 163 |
# Applet doesn't work with GNOME 3: gnome bug 642707 |
| 164 |
+ # Spice support? |
| 165 |
G2CONF="${G2CONF} |
| 166 |
+ --disable-schemas-compile |
| 167 |
--disable-scrollkeeper |
| 168 |
--disable-applet |
| 169 |
+ --disable-spice |
| 170 |
--enable-rdp |
| 171 |
$(use_enable avahi) |
| 172 |
$(use_enable introspection) |
| 173 |
@@ -62,17 +65,17 @@ src_prepare() { |
| 174 |
} |
| 175 |
|
| 176 |
src_compile() { |
| 177 |
- # GConf sucks. Thankfully it's going away: gnome bug 625895 |
| 178 |
- addpredict "$(unset HOME; echo ~)/.gconf" |
| 179 |
- addpredict "$(unset HOME; echo ~)/.gconfd" |
| 180 |
- # Dbus is needed for introspection because it runs vinagre, which needs GConf. |
| 181 |
+ # Dbus is needed for introspection because it runs vinagre. |
| 182 |
# Hence, we need X. But that's okay, because dbus auto-exits after a while. |
| 183 |
- Xemake || die |
| 184 |
+ # Also, we need the schemas from data/ to run the app for introspection. |
| 185 |
+ local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}" |
| 186 |
+ ${updater} --allow-any-name "${S}/data" || die |
| 187 |
+ GSETTINGS_SCHEMA_DIR=${S}/data Xemake || die |
| 188 |
} |
| 189 |
|
| 190 |
src_install() { |
| 191 |
gnome2_src_install |
| 192 |
|
| 193 |
# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed |
| 194 |
- rm -rf "${D}"/usr/share/doc/vinagre |
| 195 |
+ rm -rf "${ED}"/usr/share/doc/vinagre |
| 196 |
} |
Archives