public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
Date: Sun, 13 Apr 2014 00:22:16 +0000 (UTC)	[thread overview]
Message-ID: <1397348401.272f3e61163fa0f5e278faac49477eba257ad0e7.eva@gentoo> (raw)

commit:     272f3e61163fa0f5e278faac49477eba257ad0e7
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 20:37:02 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 13 00:20:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=272f3e61

net-im/empathy: 3.10.3 → 3.12.0

---
 .../{empathy-9999.ebuild => empathy-3.12.0.ebuild}     | 18 ++++--------------
 net-im/empathy/empathy-9999.ebuild                     |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.12.0.ebuild
similarity index 87%
copy from net-im/empathy/empathy-9999.ebuild
copy to net-im/empathy/empathy-3.12.0.ebuild
index f9d5bca..06f7955 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-3.12.0.ebuild
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
 
 inherit gnome2 python-any-r1 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Empathy"
@@ -18,13 +15,9 @@ HOMEPAGE="https://wiki.gnome.org/Empathy"
 LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
 SLOT="0"
 
-# sendto: support from building nautilus sendto plugins from it was dropped in 3.7
 IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
@@ -52,7 +45,7 @@ COMMON_DEPEND="
 
 	net-libs/farstream:0.2
 	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.19.9
+	>=net-libs/telepathy-glib-0.23.2
 	>=net-im/telepathy-logger-0.8.0:=
 
 	app-crypt/gcr
@@ -104,14 +97,11 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} = 9999 ]] || myconf="${myconf} ITSTOOL=$(type -P true)"
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 	gnome2_src_configure \
 		--disable-Werror \
 		--disable-coding-style-checks \
 		--disable-static \
-		--disable-nautilus-sendto
 		--disable-ubuntu-online-accounts \
 		--enable-gst-1.0 \
 		$(use_enable debug) \
@@ -122,7 +112,7 @@ src_configure() {
 		$(use_enable spell) \
 		$(use_enable v4l gudev) \
 		$(use_with v4l cheese) \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }
 
 src_test() {

diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index f9d5bca..e8b8652 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -52,7 +52,7 @@ COMMON_DEPEND="
 
 	net-libs/farstream:0.2
 	>=net-libs/telepathy-farstream-0.6.0:=
-	>=net-libs/telepathy-glib-0.19.9
+	>=net-libs/telepathy-glib-0.23.2
 	>=net-im/telepathy-logger-0.8.0:=
 
 	app-crypt/gcr


             reply	other threads:[~2014-04-13  0:22 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-13  0:22 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-10-25 21:07 [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ Gilles Dartiguelongue
2014-04-23 22:14 Gilles Dartiguelongue
2013-12-08 21:46 Gilles Dartiguelongue
2012-12-26 23:00 Gilles Dartiguelongue
2012-12-21 23:33 Gilles Dartiguelongue
2012-12-21 23:27 Gilles Dartiguelongue
2012-12-08 23:06 Alexandre Rostovtsev
2012-12-08 17:51 Alexandre Rostovtsev
2012-11-21 20:51 Gilles Dartiguelongue
2012-11-07 20:07 Alexandre Rostovtsev
2012-10-27 21:09 Gilles Dartiguelongue
2012-09-21  0:27 Nirbheek Chauhan
2012-09-10 16:36 Alexandre Rostovtsev
2012-09-09 12:43 Nirbheek Chauhan
2012-07-18  0:59 Alexandre Restovtsev
2012-05-24  9:11 Alexandre Restovtsev
2012-05-02  5:33 Alexandre Restovtsev
2012-04-06  8:38 Alexandre Restovtsev
2012-04-06  3:14 Alexandre Restovtsev
2012-03-28 21:00 Nirbheek Chauhan
2012-03-28 19:53 Nirbheek Chauhan
2012-03-26  8:20 Nirbheek Chauhan
2011-11-04  5:12 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2011-10-11  6:40 Alexandre Restovtsev
2011-07-27  5:51 Alexandre Restovtsev
2011-05-30 17:11 Nirbheek Chauhan
2011-04-29 17:29 Nirbheek Chauhan
2011-04-17 21:28 Gilles Dartiguelongue
2011-04-10 21:44 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-29  8:35 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-14 21:59 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-02-22 20:35 Nirbheek Chauhan
2011-02-15 23:45 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=1397348401.272f3e61163fa0f5e278faac49477eba257ad0e7.eva@gentoo \
    --to=eva@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