From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/
Date: Fri, 21 Dec 2012 23:27:04 +0000 (UTC) [thread overview]
Message-ID: <1356132087.155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a.eva@gentoo> (raw)
commit: 155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 23:21:27 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 23:21:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=155e6b34
net-im/empathy: switch to gstreamer:1.0
* Switch to python-any-r1 for build env.
* Switch to gstreamer:1.0
* Raise telepathy-mission-control according to mail on distributor
list.
* Add missing folks[telepathy] dependency.
* Add missing licenses.
---
...thy-3.6.2-r1.ebuild => empathy-3.6.2-r2.ebuild} | 53 ++++++++------------
net-im/empathy/empathy-9999.ebuild | 53 ++++++++------------
2 files changed, 42 insertions(+), 64 deletions(-)
diff --git a/net-im/empathy/empathy-3.6.2-r1.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild
similarity index 72%
rename from net-im/empathy/empathy-3.6.2-r1.ebuild
rename to net-im/empathy/empathy-3.6.2-r2.ebuild
index 9066c88..d454a7f 100644
--- a/net-im/empathy/empathy-3.6.2-r1.ebuild
+++ b/net-im/empathy/empathy-3.6.2-r2.ebuild
@@ -5,9 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{5,6,7} )
-inherit gnome2 python virtualx
+inherit gnome2 python-any-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
@@ -25,12 +25,13 @@ else
fi
# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=
+ >=dev-libs/folks-0.7.3:=[telepathy]
dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- media-libs/gstreamer:0.10
+ media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
- >=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/clutter-gst:2.0
media-libs/cogl:1.0=
- net-libs/farstream
- >=net-libs/telepathy-farstream-0.2.1
+ net-libs/farstream:0.2
+ >=net-libs/telepathy-farstream-0.5:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13
+ >=net-im/telepathy-logger-0.2.13:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
- media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4
virtual/udev[gudev] )"
-# >=media-video/cheese-3.4
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPENDS}
dev-libs/libxml2:2
-
+ dev-libs/libxslt
>=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5.12"
-
-pkg_setup() {
- # Build time python tools need python2
- python_set_active_version 2
- python_pkg_setup
-}
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
--disable-coding-style-checks
- --disable-schemas-compile
--disable-static
--disable-Werror
- --disable-gst-1.0
+ --enable-gst-1.0
$(use_enable debug)
$(use_enable geocode)
$(use_enable geoloc location)
@@ -115,10 +106,8 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- --without-cheese
+ $(use_with v4l cheese)
$(use_enable v4l gudev)"
-# $(use_with v4l cheese)
-# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-9999.ebuild
index 9066c88..d454a7f 100644
--- a/net-im/empathy/empathy-9999.ebuild
+++ b/net-im/empathy/empathy-9999.ebuild
@@ -5,9 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{5,6,7} )
-inherit gnome2 python virtualx
+inherit gnome2 python-any-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,7 +15,7 @@ fi
DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
HOMEPAGE="http://live.gnome.org/Empathy"
-LICENSE="GPL-2"
+LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
SLOT="0"
IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l"
if [[ ${PV} = 9999 ]]; then
@@ -25,12 +25,13 @@ else
fi
# gdk-pixbuf and pango extensively used in libempathy-gtk
-COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.33.3:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.5.1:3
x11-libs/pango
>=dev-libs/dbus-glib-0.51
- >=dev-libs/folks-0.7.3:=
+ >=dev-libs/folks-0.7.3:=[telepathy]
dev-libs/libgee:0=
>=app-crypt/libsecret-0.5
>=media-libs/libcanberra-0.25[gtk3]
@@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=net-libs/webkit-gtk-1.3.13:3
>=x11-libs/libnotify-0.7
- media-libs/gstreamer:0.10
+ media-libs/gstreamer:1.0
>=media-libs/clutter-1.10.0:1.0
>=media-libs/clutter-gtk-1.1.2:1.0
- >=media-libs/clutter-gst-1.5.2:1.0
+ media-libs/clutter-gst:2.0
media-libs/cogl:1.0=
- net-libs/farstream
- >=net-libs/telepathy-farstream-0.2.1
+ net-libs/farstream:0.2
+ >=net-libs/telepathy-farstream-0.5:=
>=net-libs/telepathy-glib-0.19.9
- >=net-im/telepathy-logger-0.2.13
+ >=net-im/telepathy-logger-0.2.13:=
app-crypt/gcr
dev-libs/libxml2:2
@@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2
>=app-text/enchant-1.2
>=app-text/iso-codes-0.35 )
v4l? (
- media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4
virtual/udev[gudev] )"
-# >=media-video/cheese-3.4
-
-# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-# empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:0.10
- media-libs/gst-plugins-bad:0.10
+ media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
!<net-voip/telepathy-rakia-0.7
x11-themes/gnome-icon-theme-symbolic
gnome? ( gnome-extra/gnome-contacts )"
DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPENDS}
dev-libs/libxml2:2
-
+ dev-libs/libxslt
>=dev-util/intltool-0.50.0
virtual/pkgconfig
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
- dev-libs/libxslt"
-PDEPEND=">=net-im/telepathy-mission-control-5.12"
-
-pkg_setup() {
- # Build time python tools need python2
- python_set_active_version 2
- python_pkg_setup
-}
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
src_configure() {
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-ubuntu-online-accounts
--disable-coding-style-checks
- --disable-schemas-compile
--disable-static
--disable-Werror
- --disable-gst-1.0
+ --enable-gst-1.0
$(use_enable debug)
$(use_enable geocode)
$(use_enable geoloc location)
@@ -115,10 +106,8 @@ src_configure() {
$(use_enable map)
$(use_enable sendto nautilus-sendto)
$(use_enable spell)
- --without-cheese
+ $(use_with v4l cheese)
$(use_enable v4l gudev)"
-# $(use_with v4l cheese)
-# cheese-3.6 is gst-1.0-only; readd it when we have "--enable-gst-1.0"
[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}
next reply other threads:[~2012-12-21 23:27 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-21 23:27 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
2014-04-13 0:22 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-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=1356132087.155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a.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