public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vino/
Date: Wed,  5 Sep 2012 15:48:58 +0000 (UTC)	[thread overview]
Message-ID: <1346860102.b759c108f2e4049bcc5001e12ca288e6093d9853.nirbheek@gentoo> (raw)

commit:     b759c108f2e4049bcc5001e12ca288e6093d9853
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 22:28:57 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b759c108

Add net-misc/vino-3.5.90

---
 .../vino/{vino-9999.ebuild => vino-3.5.90.ebuild}  |   15 +++++++--------
 net-misc/vino/vino-9999.ebuild                     |   15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-3.5.90.ebuild
similarity index 82%
copy from net-misc/vino/vino-9999.ebuild
copy to net-misc/vino/vino-3.5.90.ebuild
index d9b8172..a08c637 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-3.5.90.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="avahi crypt ipv6 jpeg gnome-keyring libnotify networkmanager ssl +telepathy +zlib"
+IUSE="avahi crypt ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
 
 # cairo used in vino-fb
 # libSM and libICE used in eggsmclient-xsmp
@@ -43,21 +43,19 @@ RDEPEND=">=dev-libs/glib-2.26: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 ) )
+	gnome-keyring? ( app-crypt/libsecret )
 	jpeg? ( virtual/jpeg:0 )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? ( >=net-libs/gnutls-2.2.0 )
-	telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50
 	virtual/pkgconfig
-	|| (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 )"
-# keyring is always required at build time per bug 322763
+	app-crypt/libsecret"
+# libsecret is always required at build time per bug 322763
 
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
@@ -74,6 +72,7 @@ pkg_setup() {
 		$(use_with gnome-keyring)
 		$(use_with libnotify)
 		$(use_with networkmanager network-manager)
+		$(use_with secret)
 		$(use_with ssl gnutls)
 		$(use_with telepathy)
 		$(use_with zlib)"

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index d9b8172..a08c637 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="avahi crypt ipv6 jpeg gnome-keyring libnotify networkmanager ssl +telepathy +zlib"
+IUSE="avahi crypt ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
 
 # cairo used in vino-fb
 # libSM and libICE used in eggsmclient-xsmp
@@ -43,21 +43,19 @@ RDEPEND=">=dev-libs/glib-2.26: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 ) )
+	gnome-keyring? ( app-crypt/libsecret )
 	jpeg? ( virtual/jpeg:0 )
 	libnotify? ( >=x11-libs/libnotify-0.7.0 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? ( >=net-libs/gnutls-2.2.0 )
-	telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
+	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
+	>=dev-util/intltool-0.50
 	virtual/pkgconfig
-	|| (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 )"
-# keyring is always required at build time per bug 322763
+	app-crypt/libsecret"
+# libsecret is always required at build time per bug 322763
 
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
@@ -74,6 +72,7 @@ pkg_setup() {
 		$(use_with gnome-keyring)
 		$(use_with libnotify)
 		$(use_with networkmanager network-manager)
+		$(use_with secret)
 		$(use_with ssl gnutls)
 		$(use_with telepathy)
 		$(use_with zlib)"


             reply	other threads:[~2012-09-05 15:52 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-05 15:48 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:41 [gentoo-commits] proj/gnome:master commit in: net-misc/vino/ Dennis Lamm
2016-04-02 16:34 Ole Reifschneider
2015-06-09 13:48 Gilles Dartiguelongue
2015-05-14 18:22 Gilles Dartiguelongue
2015-05-08 23:36 Gilles Dartiguelongue
2014-12-26 21:48 Gilles Dartiguelongue
2014-11-23 22:27 Gilles Dartiguelongue
2014-04-06 18:22 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2013-11-15  8:04 Gilles Dartiguelongue
2013-10-13 22:22 Gilles Dartiguelongue
2012-12-18 22:53 Gilles Dartiguelongue
2012-12-18 22:31 Gilles Dartiguelongue
2012-11-21 22:52 Gilles Dartiguelongue
2012-09-22 18:03 Nirbheek Chauhan
2012-05-24  9:12 Alexandre Restovtsev
2011-10-28  2:23 Alexandre Restovtsev
2011-07-15 15:44 Alexandre Restovtsev
2011-05-02 17:10 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-16 23:14 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  0:37 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-02-23 18:03 Nirbheek Chauhan
2011-02-23 14:40 Nirbheek Chauhan
2011-02-22  0:31 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346860102.b759c108f2e4049bcc5001e12ca288e6093d9853.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox