| 1 |
commit: 2faab3edfdea7e231f57c8e52eddc3ddc2ebf83c |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 28 18:06:16 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 28 18:07:56 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2faab3ed |
| 7 |
|
| 8 |
net-misc/vinagre: 3.5.92 → 3.6.1 |
| 9 |
|
| 10 |
sed is pulled in by gnome2 eclass. Sync with gx86 changes. |
| 11 |
|
| 12 |
--- |
| 13 |
...{vinagre-3.5.92.ebuild => vinagre-3.6.1.ebuild} | 12 +++++++----- |
| 14 |
net-misc/vinagre/vinagre-9999.ebuild | 12 +++++++----- |
| 15 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/vinagre/vinagre-3.5.92.ebuild b/net-misc/vinagre/vinagre-3.6.1.ebuild |
| 18 |
similarity index 91% |
| 19 |
rename from net-misc/vinagre/vinagre-3.5.92.ebuild |
| 20 |
rename to net-misc/vinagre/vinagre-3.6.1.ebuild |
| 21 |
index 6c76622..86fb3be 100644 |
| 22 |
--- a/net-misc/vinagre/vinagre-3.5.92.ebuild |
| 23 |
+++ b/net-misc/vinagre/vinagre-3.6.1.ebuild |
| 24 |
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then |
| 25 |
else |
| 26 |
KEYWORDS="~amd64 ~x86" |
| 27 |
fi |
| 28 |
-IUSE="avahi +ssh spice +telepathy" |
| 29 |
+IUSE="avahi rdp +ssh spice +telepathy" |
| 30 |
|
| 31 |
# cairo used in vinagre-tab |
| 32 |
# gdk-pixbuf used all over the place |
| 33 |
@@ -35,6 +35,7 @@ RDEPEND=">=dev-libs/glib-2.28.0:2 |
| 34 |
x11-themes/gnome-icon-theme |
| 35 |
|
| 36 |
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) |
| 37 |
+ rdp? ( net-misc/rdesktop ) |
| 38 |
ssh? ( >=x11-libs/vte-0.20:2.90 ) |
| 39 |
spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) |
| 40 |
telepathy? ( |
| 41 |
@@ -43,10 +44,10 @@ RDEPEND=">=dev-libs/glib-2.28.0:2 |
| 42 |
" |
| 43 |
DEPEND="${RDEPEND} |
| 44 |
>=dev-lang/perl-5 |
| 45 |
- sys-apps/sed |
| 46 |
>=dev-util/intltool-0.50 |
| 47 |
>=sys-devel/gettext-0.17 |
| 48 |
- virtual/pkgconfig" |
| 49 |
+ virtual/pkgconfig |
| 50 |
+" |
| 51 |
|
| 52 |
if [[ ${PV} = 9999 ]]; then |
| 53 |
DEPEND+=" |
| 54 |
@@ -55,16 +56,17 @@ if [[ ${PV} = 9999 ]]; then |
| 55 |
gnome-base/gnome-common" |
| 56 |
fi |
| 57 |
|
| 58 |
-pkg_setup() { |
| 59 |
+src_configure() { |
| 60 |
DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README" |
| 61 |
G2CONF="${G2CONF} |
| 62 |
VALAC=$(type -P valac-0.18) |
| 63 |
--disable-schemas-compile |
| 64 |
- --enable-rdp |
| 65 |
$(use_with avahi) |
| 66 |
+ $(use_enable rdp) |
| 67 |
$(use_enable ssh) |
| 68 |
$(use_enable spice) |
| 69 |
$(use_with telepathy)" |
| 70 |
+ gnome2_src_configure |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
| 74 |
|
| 75 |
diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild |
| 76 |
index 6c76622..86fb3be 100644 |
| 77 |
--- a/net-misc/vinagre/vinagre-9999.ebuild |
| 78 |
+++ b/net-misc/vinagre/vinagre-9999.ebuild |
| 79 |
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then |
| 80 |
else |
| 81 |
KEYWORDS="~amd64 ~x86" |
| 82 |
fi |
| 83 |
-IUSE="avahi +ssh spice +telepathy" |
| 84 |
+IUSE="avahi rdp +ssh spice +telepathy" |
| 85 |
|
| 86 |
# cairo used in vinagre-tab |
| 87 |
# gdk-pixbuf used all over the place |
| 88 |
@@ -35,6 +35,7 @@ RDEPEND=">=dev-libs/glib-2.28.0:2 |
| 89 |
x11-themes/gnome-icon-theme |
| 90 |
|
| 91 |
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) |
| 92 |
+ rdp? ( net-misc/rdesktop ) |
| 93 |
ssh? ( >=x11-libs/vte-0.20:2.90 ) |
| 94 |
spice? ( >=net-misc/spice-gtk-0.5[gtk3] ) |
| 95 |
telepathy? ( |
| 96 |
@@ -43,10 +44,10 @@ RDEPEND=">=dev-libs/glib-2.28.0:2 |
| 97 |
" |
| 98 |
DEPEND="${RDEPEND} |
| 99 |
>=dev-lang/perl-5 |
| 100 |
- sys-apps/sed |
| 101 |
>=dev-util/intltool-0.50 |
| 102 |
>=sys-devel/gettext-0.17 |
| 103 |
- virtual/pkgconfig" |
| 104 |
+ virtual/pkgconfig |
| 105 |
+" |
| 106 |
|
| 107 |
if [[ ${PV} = 9999 ]]; then |
| 108 |
DEPEND+=" |
| 109 |
@@ -55,16 +56,17 @@ if [[ ${PV} = 9999 ]]; then |
| 110 |
gnome-base/gnome-common" |
| 111 |
fi |
| 112 |
|
| 113 |
-pkg_setup() { |
| 114 |
+src_configure() { |
| 115 |
DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README" |
| 116 |
G2CONF="${G2CONF} |
| 117 |
VALAC=$(type -P valac-0.18) |
| 118 |
--disable-schemas-compile |
| 119 |
- --enable-rdp |
| 120 |
$(use_with avahi) |
| 121 |
+ $(use_enable rdp) |
| 122 |
$(use_enable ssh) |
| 123 |
$(use_enable spice) |
| 124 |
$(use_with telepathy)" |
| 125 |
+ gnome2_src_configure |
| 126 |
} |
| 127 |
|
| 128 |
src_install() { |
Archives