5 files changed, 15 insertions, 88 deletions
diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 57c7a6381e6a..b47b67bfa18b 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.153 2010/10/20 22:08:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.154 2010/11/08 22:59:37 eva Exp $
+
+  08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -vino-2.26.2-r2.ebuild, vino-2.28.2.ebuild, vino-2.32.0.ebuild:
+  Allow use of alternate jpeg implementation. Clean up old revisions.
 
 *vino-2.32.0 (20 Oct 2010)
 
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 8475f2292d98..d322d638b6f5 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA1
 
 AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b557063c4518a SHA1 e0c59939d7a36e295bbc1fbe03f9efa0c6e0d1b6 SHA256 e4c09b2a68a803eadb1b91f710ff6a9870a28cafef7856eb844806aec53c853e
-DIST vino-2.26.2.tar.bz2 724845 RMD160 ab6c3a0f3e677f7b3fa4c0956e2246870a84077f SHA1 8e5c7bbe9900e954ed3096743ffba4e7640be508 SHA256 b42580887d91ed2ffc1f2e8e05f4dd0f7304abd98a04139bdb9a674022dd6913
 DIST vino-2.28.2.tar.bz2 795208 RMD160 541006f8fac7b951bfc236869e52a3b1c02e1ed1 SHA1 7d6863956356475b8784cdd2017bfbbd0e0ce15e SHA256 f2a0b7c77fe58f3918b202a9f0f4ae3295518ac43eeceade0875b096038a72e0
 DIST vino-2.32.0.tar.bz2 855538 RMD160 d83d52528e8eb5d29b0b2f63acd54c122654afd8 SHA1 85c0a8127545d45f3e9ab7027ef9c598f04e9d58 SHA256 00446f52eb03893be9d69dadbb3899b58676c122f33db670f46dc19e4a7d3d6d
-EBUILD vino-2.26.2-r2.ebuild 2140 RMD160 9bd7e3d2870e969fd8feef37906d3eb772784e60 SHA1 1dd4b69cc18e57ecd143f8222631a8c82414d310 SHA256 3350bab8ad69a8c9f1661d9e398bf2968ae43bc373d125b52f3439de8a0769d5
-EBUILD vino-2.28.2.ebuild 2343 RMD160 7e532a1cdf9397709bcc48f2064f5abe7202e8c9 SHA1 bd54493ac7044ed888ca07f932fdf0e80d0549d8 SHA256 5d8354bb4d5cdd1221875cfeb23be01675f2820ecf091dd935a7500d9a9e3048
-EBUILD vino-2.32.0.ebuild 2228 RMD160 8f5021863afc25ec2aaa367e98af43295fab4d77 SHA1 17cb5dd5e2049442b06022582ae685da969992a3 SHA256 42c3faad05c36d18279b73b1be2232282f0dcdd1771a449ac6b1bfeec3137fe4
-MISC ChangeLog 18927 RMD160 c4fc3f0198bb0a4d85f2f0655ec3dc5ae6d30cec SHA1 fef73c86d9f212ccf3aa100b14bdf640a6cc3b9f SHA256 2b86277701a0e0921e69ec4856a74be825d906bc85d2e2c513a5b860857ff65c
+EBUILD vino-2.28.2.ebuild 2336 RMD160 86f432745cabba74e14783cbbfd6692b162c6428 SHA1 d669a8517a3741287d4718157687f74c992f0451 SHA256 049439f45a789578c1154f95fd3acf82aca820fa9962b42c37e325bb8ed8add4
+EBUILD vino-2.32.0.ebuild 2227 RMD160 958656f9cec7fb5ab532650f62983f86f41b192f SHA1 91a68b91f8114174da8773365b20ccd0f05aa707 SHA256 ddf9819ed6af324d50c45e1d3be37c7cdd27757bb68c1639730747479e8afe7b
+MISC ChangeLog 19118 RMD160 2846daa9dca1c22bbb9331da2c91e9ca12132341 SHA1 5be2e975616051a4cb3aea523e7b38b90bc4893f SHA256 d7b62f4c6d85affb4b4fe5be6db6b851718f710df4caa19ae19dc20028509e5d
 MISC metadata.xml 252 RMD160 5b0b8374f7b039e12c213212494427ecd15387e2 SHA1 84868304c07b4f56d8acec522b1bc105bbaf350e SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky/aE8ACgkQ1fmVwcYIWAb7tQCeKwItcj2050nVB+lp0Zo5ECM5
-usEAn0EsiYzw+PRCQCc2nywsrYd0wVcE
-=7naC
+iEYEARECAAYFAkzYjvUACgkQ1fmVwcYIWAYk8ACgwe7vW69k2YjFZNqV9anqUG6C
+TQUAnjoW9X2pauJO2p434bsVDpeLbw28
+=RafX
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/vino-2.26.2-r2.ebuild b/net-misc/vino/vino-2.26.2-r2.ebuild
deleted file mode 100644
index 08851b45746c..000000000000
--- a/net-misc/vino/vino-2.26.2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 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.9 2010/07/20 02:28:20 jer 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 ia64 ppc 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"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "If you are getting refresh problems when using special 3D effects,"
-	elog "try disabling XDamage extension. For that, you can run the following:"
-	elog " gconftool-2 --type boolean --set /desktop/gnome/remote_access/disable_xdamage true"
-	elog "This is due http://bugs.freedesktop.org/12255"
-}
diff --git a/net-misc/vino/vino-2.28.2.ebuild b/net-misc/vino/vino-2.28.2.ebuild
index ce43a765a728..892a0634ffaa 100644
--- a/net-misc/vino/vino-2.28.2.ebuild
+++ b/net-misc/vino/vino-2.28.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.28.2.ebuild,v 1.11 2010/10/09 15:23:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.28.2.ebuild,v 1.12 2010/11/08 22:59:37 eva Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.17
 	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? ( >=net-libs/gnutls-1 )
 	telepathy? ( >=net-libs/telepathy-glib-0.7.31 )
diff --git a/net-misc/vino/vino-2.32.0.ebuild b/net-misc/vino/vino-2.32.0.ebuild
index bba7d2f923c3..346321173eac 100644
--- a/net-misc/vino/vino-2.32.0.ebuild
+++ b/net-misc/vino/vino-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.32.0.ebuild,v 1.1 2010/10/20 22:08:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.32.0.ebuild,v 1.2 2010/11/08 22:59:37 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.17:2
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90 )
 	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	libnotify? ( >=x11-libs/libnotify-0.4.4 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? ( >=net-libs/gnutls-1 )