[gentoo-commits] proj/gnome:master commit in: net-misc/vino/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     836a70f34eca4a91559cee7e758c665d7604ced4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 17:53:51 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=836a70f3

net-misc/vino: 3.10.1 → 3.12.0

---
 .../vino/{vino-9999.ebuild => vino-3.12.0.ebuild}     | 19 ++-----------------
 net-misc/vino/vino-9999.ebuild                        | 10 +---------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-3.12.0.ebuild
similarity index 81%
copy from net-misc/vino/vino-9999.ebuild
copy to net-misc/vino/vino-3.12.0.ebuild
index 1237021..da7d7e9 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-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: $
 
@@ -6,20 +6,13 @@ EAPI="5"
 GCONF_DEBUG="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="An integrated VNC server for GNOME"
 HOMEPAGE="http://live.gnome.org/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
@@ -60,14 +53,6 @@ DEPEND="${RDEPEND}
 	app-crypt/libsecret"
 # libsecret is always required at build time per bug 322763
 
-src_prepare() {
-	# <glib-2.31 compatibility
-	if [[ ${PV} != 9999 ]]; then
-		rm -v server/vino-marshal.{c,h} || die
-	fi
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--enable-http-server \

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index 1237021..ac40235 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-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: $
 
@@ -60,14 +60,6 @@ DEPEND="${RDEPEND}
 	app-crypt/libsecret"
 # libsecret is always required at build time per bug 322763
 
-src_prepare() {
-	# <glib-2.31 compatibility
-	if [[ ${PV} != 9999 ]]; then
-		rm -v server/vino-marshal.{c,h} || die
-	fi
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--enable-http-server \