[gentoo-commits] proj/gnome:gnome-next commit in: net-misc/vinagre/

[Alexandre Restovtsev]

commit:     fc9f4877d33f975aa612c9aa33dcf42e98d22aba
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 06:15:44 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 06:15:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fc9f4877

net-misc/vinagre: 3.0.2 → 3.1.4

Bump to gnome-3.1.x version. Update dependencies. Introspection support
was removed by upstream, so workaround is no longer needed.

---
 .../{vinagre-3.0.2.ebuild => vinagre-3.1.4.ebuild} |   22 ++-------
 net-misc/vinagre/vinagre-9999.ebuild               |   48 +++++++-------------
 2 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/net-misc/vinagre/vinagre-3.0.2.ebuild b/net-misc/vinagre/vinagre-3.1.4.ebuild
similarity index 69%
rename from net-misc/vinagre/vinagre-3.0.2.ebuild
rename to net-misc/vinagre/vinagre-3.1.4.ebuild
index 7e03e88..d98af8e 100644
--- a/net-misc/vinagre/vinagre-3.0.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,25 +21,23 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="applet avahi +introspection +ssh +telepathy test"
+IUSE="avahi +ssh +telepathy test"
 
-RDEPEND=">=dev-libs/glib-2.25.11:2
+RDEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-3.0.3:3
-	>=dev-libs/libpeas-0.7.2[gtk]
 	>=dev-libs/libxml2-2.6.31:2
 	>=net-libs/gtk-vnc-0.4.3[gtk3]
 	>=gnome-base/gnome-keyring-1
 	x11-themes/gnome-icon-theme
 
-	applet? ( >=gnome-base/gnome-panel-2.91 )
 	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? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )
 "
 DEPEND="${RDEPEND}
+	dev-lang/vala:0.12
 	gnome-base/gnome-common
 	>=dev-lang/perl-5
 	>=dev-util/pkgconfig-0.16
@@ -54,26 +52,16 @@ pkg_setup() {
 	# Spice support?
 	# SSH support fails to compile
 	G2CONF="${G2CONF}
+		VALAC=$(type -p valac-0.12)
 		--disable-schemas-compile
 		--disable-scrollkeeper
 		--disable-spice
 		--enable-rdp
-		$(use_with applet panelapplet)
 		$(use_with avahi)
-		$(use_enable introspection)
 		$(use_enable ssh)
 		$(use_with telepathy)"
 }
 
-src_compile() {
-	# Dbus is needed for introspection because it runs vinagre.
-	# Hence, we need X. But that's okay, because dbus auto-exits after a while.
-	# 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
 

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index 3884b35..d98af8e 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -2,11 +2,11 @@
 # 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="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,64 +16,50 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="applet avahi +introspection +telepathy test" #+ssh
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="avahi +ssh +telepathy test"
 
-RDEPEND=">=dev-libs/glib-2.25.11:2
-		>=x11-libs/gtk+-2.99.3:3
-	>=dev-libs/libpeas-0.7.2[gtk]
+RDEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.0.3:3
 	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3-r300
-
-	gnome-base/gnome-keyring
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	>=gnome-base/gnome-keyring-1
+	x11-themes/gnome-icon-theme
 
 	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? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )
-	applet? ( >=gnome-base/gnome-panel-2.91 )"
-#	ssh? ( >=x11-libs/vte-0.20:2.90 )
+"
 DEPEND="${RDEPEND}
+	dev-lang/vala:0.12
 	gnome-base/gnome-common
 	>=dev-lang/perl-5
-	>=dev-util/pkgconfig-0.9
+	>=dev-util/pkgconfig-0.16
 	>=dev-util/intltool-0.40
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
+	>=sys-devel/gettext-0.17
 	test? ( ~app-text/docbook-xml-dtd-4.3 )"
 
-DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-
-src_prepare() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	# Spice support?
 	# SSH support fails to compile
 	G2CONF="${G2CONF}
+		VALAC=$(type -p valac-0.12)
 		--disable-schemas-compile
 		--disable-scrollkeeper
 		--disable-spice
-		--disable-ssh
 		--enable-rdp
-		$(use_with panelapplet)
 		$(use_with avahi)
-		$(use_enable introspection)
+		$(use_enable ssh)
 		$(use_with telepathy)"
-		#$(use_enable ssh)
-
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# Dbus is needed for introspection because it runs vinagre.
-	# Hence, we need X. But that's okay, because dbus auto-exits after a while.
-	# 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() {