commit: b310c965d7237020977e5d03fb532a0a78d077a2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 17:56:12 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 6 18:05:17 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b310c965
net-misc/vinagre: 3.10.2 → 3.12.0
---
.../{vinagre-9999.ebuild => vinagre-3.12.0.ebuild} | 32 ++++------------------
net-misc/vinagre/vinagre-9999.ebuild | 12 ++------
2 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/net-misc/vinagre/vinagre-9999.ebuild
b/net-misc/vinagre/vinagre-3.12.0.ebuild
similarity index 67%
copy from net-misc/vinagre/vinagre-9999.ebuild
copy to net-misc/vinagre/vinagre-3.12.0.ebuild
index 10f31ec..659c77f 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,20 +7,13 @@ GCONF_DEBUG="no"
VALA_MIN_API_VERSION=0.18
inherit gnome2 vala
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="VNC client for the GNOME desktop"
HOMEPAGE="https://wiki.gnome.org/Vinagre";
LICENSE="GPL-3+"
SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="avahi rdp +ssh spice +telepathy"
# cairo used in vinagre-tab
@@ -37,7 +30,7 @@ RDEPEND="
x11-themes/gnome-icon-theme
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
- rdp? ( net-misc/rdesktop )
+ rdp? ( net-misc/freerdp )
ssh? ( >=x11-libs/vte-0.20:2.90 )
spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
telepathy? (
@@ -52,33 +45,18 @@ DEPEND="${RDEPEND}
$(vala_depend)
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND+="
- app-text/yelp-tools
- gnome-base/gnome-common"
-fi
-
src_prepare() {
vala_src_prepare
gnome2_src_prepare
}
src_configure() {
- local myconf=""
- [[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)"
+ DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
gnome2_src_configure \
$(use_with avahi) \
$(use_enable rdp) \
$(use_enable ssh) \
$(use_enable spice) \
$(use_with telepathy) \
- ${myconf}
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
- gnome2_src_install
-
- # Remove its own installation of DOCS that go to $PN instead of $P and
aren't ecompressed
- rm -r "${ED}"/usr/share/doc/vinagre || die
+ ITSTOOL=$(type -P true)
}
diff --git a/net-misc/vinagre/vinagre-9999.ebuild
b/net-misc/vinagre/vinagre-9999.ebuild
index 10f31ec..ec10d9b 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -37,7 +37,7 @@ RDEPEND="
x11-themes/gnome-icon-theme
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
- rdp? ( net-misc/rdesktop )
+ rdp? ( net-misc/freerdp )
ssh? ( >=x11-libs/vte-0.20:2.90 )
spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
telepathy? (
@@ -74,11 +74,3 @@ src_configure() {
$(use_with telepathy) \
${myconf}
}
-
-src_install() {
- DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
- gnome2_src_install
-
- # Remove its own installation of DOCS that go to $PN instead of $P and
aren't ecompressed
- rm -r "${ED}"/usr/share/doc/vinagre || die
-}
