summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/vino')
-rw-r--r--net-misc/vino/ChangeLog10
-rw-r--r--net-misc/vino/vino-2.26.2-r1.ebuild7
-rw-r--r--net-misc/vino/vino-2.26.2-r2.ebuild66
3 files changed, 78 insertions, 5 deletions
diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 27873e5f0ca9..af16a9f829c6 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-misc/vino
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.126 2009/08/16 08:34:22 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.127 2009/09/27 15:44:14 nirbheek Exp $
+
+*vino-2.26.2-r2 (27 Sep 2009)
+
+ 27 Sep 2009; Nirbheek Chauhan <nirbheek@gentoo.org> vino-2.26.2-r1.ebuild,
+ +vino-2.26.2-r2.ebuild:
+ Remove networkmanager support from 2.26.2-r1 for stabilization since
+ networkmanager-0.7 is not going stable (2.24* doesn't have NM support).
+ Use 2.26.2-r2 for networkmanager support in ~arch
16 Aug 2009; Mart Raudsepp <leio@gentoo.org>
-files/vino-2.26.1-fbsd-fix.patch, -vino-2.26.2.ebuild:
diff --git a/net-misc/vino/vino-2.26.2-r1.ebuild b/net-misc/vino/vino-2.26.2-r1.ebuild
index f256f179b86c..e6e561a9347f 100644
--- a/net-misc/vino/vino-2.26.2-r1.ebuild
+++ b/net-misc/vino/vino-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.1 2009/08/02 10:52:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r1.ebuild,v 1.2 2009/09/27 15:44:14 nirbheek Exp $
EAPI="2"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib"
+IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify zlib"
RDEPEND=">=dev-libs/glib-2.17
>=x11-libs/gtk+-2.13.1
@@ -31,7 +31,6 @@ RDEPEND=">=dev-libs/glib-2.17
crypt? ( >=dev-libs/libgcrypt-1.1.90 )
gnutls? ( >=net-libs/gnutls-1 )
jpeg? ( media-libs/jpeg )
- networkmanager? ( >=net-misc/networkmanager-0.7 )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
>=dev-lang/perl-5
@@ -49,9 +48,9 @@ pkg_setup() {
$(use_with jpeg)
$(use_enable gnome-keyring)
$(use_enable libnotify)
- $(use_enable networkmanager network-manager)
$(use_with zlib)
$(use_with zlib libz)
+ --disable-network-manager
--enable-libunique"
}
diff --git a/net-misc/vino/vino-2.26.2-r2.ebuild b/net-misc/vino/vino-2.26.2-r2.ebuild
new file mode 100644
index 000000000000..08d7d3d5f6e3
--- /dev/null
+++ b/net-misc/vino/vino-2.26.2-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.26.2-r2.ebuild,v 1.1 2009/09/27 15:44:14 nirbheek Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt gnutls ipv6 jpeg gnome-keyring libnotify networkmanager zlib"
+
+RDEPEND=">=dev-libs/glib-2.17
+ >=x11-libs/gtk+-2.13.1
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/gconf-2
+ >=gnome-base/libglade-2
+ >=sys-apps/dbus-1.2.3
+ >=net-libs/libsoup-2.24.0:2.4
+ >=dev-libs/libunique-1.0.0
+ dev-libs/dbus-glib
+ x11-libs/libXext
+ x11-libs/libXtst
+ libnotify? ( >=x11-libs/libnotify-0.4.4 )
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ crypt? ( >=dev-libs/libgcrypt-1.1.90 )
+ gnutls? ( >=net-libs/gnutls-1 )
+ jpeg? ( media-libs/jpeg )
+ networkmanager? ( >=net-misc/networkmanager-0.7 )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ >=dev-util/pkgconfig-0.9
+ >=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+ G2CONF="${G2CONF}
+ $(use_enable avahi)
+ $(use_enable crypt gcrypt)
+ $(use_enable gnutls)
+ $(use_enable ipv6)
+ $(use_with jpeg)
+ $(use_enable gnome-keyring)
+ $(use_enable libnotify)
+ $(use_enable networkmanager network-manager)
+ $(use_with zlib)
+ $(use_with zlib libz)
+ --enable-libunique"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Fix autorestart loop, bug #277989
+ epatch "${FILESDIR}/${P}-autorestart-loop.patch"
+
+ # Fix intltoolize broken file, see upstream #577133
+ sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}