Bump to 3.2.1.1 from the gnome overlay. Remove old (and vulnerable) 3.0.2. Notable...

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 2dbc9f8a3275d1ef80d9072c5d9d5ada563c6dd4..769788f29f1e776982810ad7b69cdb0505084f36 100644 (file)
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.93 2011/10/30 12:37:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.94 2011/11/04 05:12:33 tetromino Exp $
+
+*empathy-3.2.1.1 (04 Nov 2011)
+
+  04 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -empathy-3.0.2.ebuild, +empathy-3.2.1.1.ebuild, metadata.xml:
+  Bump to 3.2.1.1 from the gnome overlay. Remove old (and vulnerable) 3.0.2.
+  Notable changes: optional farstream call support, better theming, new log
+  viewer, google talk support via gnome-online-accounts.
 
   30 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   empathy-2.34.0-r2.ebuild:

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index fd4e76f64bb4337ef5c85c22174d8110328ecaf7..449e50e438a1f1075a322746b5ec83548c0f596f 100644 (file)
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 RMD160 74947ef5803899f2882fd80186329673303c84d2 SHA1 36b1e435df44238ad8ec457148198c6f33e402c8 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54
@@ -7,17 +7,17 @@ AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d4
 AUX empathy-2.34.0-missing-include.patch 379 RMD160 c0284cfd166c731b8214f849c0503e646eb4bf7b SHA1 e01c5f0dfc57550e7933b85f0d4c61d29e58b061 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
-DIST empathy-3.0.2.tar.bz2 3319921 RMD160 52e8356b7d6e7aa21b72f0c3b217f8d85ec1d1f3 SHA1 593eb0db1a221fdd1466bb6ecc96e0f69d23d287 SHA256 8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2
+DIST empathy-3.2.1.1.tar.xz 3195440 RMD160 20af11b464744e9fc16d10f38fb2a4aa6639ddd6 SHA1 2d6cc3a8864ea7a276c36e493700fb68a73d0d43 SHA256 2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681
 EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad
 EBUILD empathy-2.34.0-r1.ebuild 3133 RMD160 bf5ee1044300b8bf62b7923e4b9a22dc6fa64d5f SHA1 1a16c403650342e09ad97581c44d6c9ee55955ab SHA256 99278f352cc03328909b0463719117d3d0979e111827c1266f5ca1d4527f55d7
 EBUILD empathy-2.34.0-r2.ebuild 3304 RMD160 817d3174f87fa0c391c3e34237b2714817b40b26 SHA1 fdd572677224c829ccc8174ab02d567503ebf93c SHA256 12d89b16abdd1cf1df2ebb9d4ccc086dd72844130b8c0b9d4bad0fa9f03f4312
-EBUILD empathy-3.0.2.ebuild 3147 RMD160 eb64ad778aa75120fb9c467de8fd6d5417a0d774 SHA1 617d0289039b842425bdff2a4bd4676a35798fca SHA256 9a3dd7a0ba15f18002e2c7bc61fe41d691bf609814241488b3afbb06601902d5
-MISC ChangeLog 16209 RMD160 b9be9eabe9b614433b0168eca54320b0ff52f0ef SHA1 47fef45d38159a99590c1a847c070d833d57b4e5 SHA256 9a712b0145e4d84bd34d15a39fe265097ddbab0b2fe45ad93e9db553f52329a6
-MISC metadata.xml 1153 RMD160 f6baad498121aff0cc361fc11a9446469d701039 SHA1 bdb24dbb700b86545343c8448b83ec42243fe2c1 SHA256 ffaffc06bc4e5417d9c7c4a41db312506f1aa1a0d54501c7f776124817b08919
+EBUILD empathy-3.2.1.1.ebuild 3350 RMD160 8cc1a951d6e7c9317e1542c4121e7235f1a93e11 SHA1 93e07e9a0571574193f99961f3787b366ba99bc0 SHA256 f0dc9ef2ce1e6284d7775a0525f7bc6933a1442f86988aab77bae06534d6e6c4
+MISC ChangeLog 16574 RMD160 efef2843f677dd7e938c53ab3d05c72c651d1f71 SHA1 5c615c6c6060140b9d3c98c21091f42a2070a0d2 SHA256 6f36a77496fa2f0983adb3364e38c66288581f15251c43ffced9d3e86b807193
+MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6tRSAACgkQuUQtlDBCeQIQpACfWDE8o3hNvTC/sXWPJdPECTu1
-b8oAn327xStV8TZzVDRNWXHwG9hJu12r
-=ZBWw
+iF4EAREIAAYFAk6zdEYACgkQdjK8w9WeBnCQmAD7BYvZLxMEElTTS5zCSTuZ4n3w
+QzlgPzgNS+1v0z7lYxkA/jpX+W+0Veu2LnGwMKanRfPdirlZuntYwK69YjXuu6kP
+=GZ/Q
 -----END PGP SIGNATURE-----

diff --git a/net-im/empathy/empathy-3.0.2.ebuild b/net-im/empathy/empathy-3.2.1.1.ebuild
similarity index 64%
rename from net-im/empathy/empathy-3.0.2.ebuild
rename to net-im/empathy/empathy-3.2.1.1.ebuild
index b6b9f86f100fa4e853c444837ced767b1208f365..267a143049d5bcb36f40fc853499918b01fa44b2 100644 (file)
--- a/net-im/empathy/empathy-3.0.2.ebuild
+++ b/net-im/empathy/empathy-3.2.1.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.0.2.ebuild,v 1.1 2011/08/18 06:22:13 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.1.ebuild,v 1.1 2011/11/04 05:12:33 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 multilib python
+inherit gnome2 python
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -15,53 +15,66 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="debug eds +gnome +map +geoloc +networkmanager sendto spell test webkit"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
 
 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
 # eventually at which point the dep can be dropped
-RDEPEND=">=dev-libs/glib-2.27.2:2
+# libgee extensively used in libempathy
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+RDEPEND=">=dev-libs/glib-2.28:2
+       x11-libs/gdk-pixbuf:2
        >=x11-libs/gtk+-3.0.2:3
+       x11-libs/pango
        >=dev-libs/dbus-glib-0.51
-       >=net-libs/telepathy-glib-0.14.1
-       >=media-libs/libcanberra-0.25[gtk3]
-       >=x11-libs/libnotify-0.7
+       >=dev-libs/folks-0.6.2
+       dev-libs/libgee:0
        >=gnome-base/gnome-keyring-2.91.4-r300
+       >=media-libs/libcanberra-0.25[gtk3]
+       media-sound/pulseaudio[glib]
        >=net-libs/gnutls-2.8.5
-       >=dev-libs/folks-0.4
+       >=net-libs/telepathy-glib-0.16.0
+       >=net-libs/webkit-gtk-1.3.13:3
+       >=x11-libs/libnotify-0.7
 
+       dev-libs/libxml2:2
        gnome-base/gsettings-desktop-schemas
-       net-libs/farsight2
        media-libs/gstreamer:0.10
        media-libs/gst-plugins-base:0.10
        media-libs/gst-plugins-bad
+       >=net-im/telepathy-logger-0.2.8
+       net-libs/farsight2
        >=net-libs/telepathy-farsight-0.0.14
-       dev-libs/libxml2:2
-       x11-libs/libX11
        net-voip/telepathy-connection-managers
-       >=net-im/telepathy-logger-0.2.8
+       x11-libs/libX11
 
+       call? (
+               >=media-libs/clutter-1.7.14:1.0
+               >=media-libs/clutter-gtk-0.90.3:1.0
+               media-libs/clutter-gst:1.0
+               net-libs/telepathy-farstream )
        eds? ( >=gnome-extra/evolution-data-server-1.2 )
        geoloc? ( >=app-misc/geoclue-0.11 )
-       gnome? ( >=gnome-base/gnome-control-center-3.0.0 )
+       gnome-online-accounts? ( net-libs/gnome-online-accounts )
        map? (
-               media-libs/libchamplain:0.10[gtk]
-               media-libs/clutter-gtk:1.0 )
+               >=media-libs/clutter-1.7.14:1.0
+               >=media-libs/clutter-gtk-0.90.3:1.0
+               media-libs/libchamplain:0.12[gtk] )
        networkmanager? ( >=net-misc/networkmanager-0.7 )
        sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
        spell? (
                >=app-text/enchant-1.2
                >=app-text/iso-codes-0.35 )
-       webkit? ( >=net-libs/webkit-gtk-1.3.2:3 )
+       v4l? (
+               || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+               media-plugins/gst-plugins-v4l2:0.10
+               >=media-video/cheese-2.91.91.1 )
 "
-# Will not build with gnome-control-center-3.1.4 due to removed headers,
-# but should (probably) continue to run
 DEPEND="${RDEPEND}
        app-text/scrollkeeper
        >=app-text/gnome-doc-utils-0.17.3
        >=dev-util/intltool-0.35.0
        >=dev-util/pkgconfig-0.16
-       gnome? ( <gnome-base/gnome-control-center-3.1.4 )
+       >=sys-devel/gettext-0.17
        test? (
                sys-apps/grep
                >=dev-libs/check-0.9.4 )
@@ -71,37 +84,32 @@ PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
 
 pkg_setup() {
        DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-       # TODO: Re-add location support
        G2CONF="${G2CONF}
                --disable-coding-style-checks
                --disable-schemas-compile
                --disable-static
                --disable-meego
                --disable-Werror
+               $(use_enable call)
                $(use_enable debug)
                $(use_with eds)
                $(use_enable geoloc location)
-               $(use_enable gnome control-center-embedding)
+               $(use_enable gnome-online-accounts goa)
                $(use_enable map)
                $(use_with networkmanager connectivity nm)
                $(use_enable sendto nautilus-sendto)
                $(use_enable spell)
-               $(use_enable webkit)"
+               $(use_with v4l cheese)
+               $(use_enable v4l gudev)"
 
-       # Build time python tools needs python2
+       # Build time python tools need python2
        python_set_active_version 2
-}
-
-src_prepare() {
-       gnome2_src_prepare
-
-       python_convert_shebangs -r 2 tools
+       python_pkg_setup
 }
 
 src_test() {
        unset DBUS_SESSION_BUS_ADDRESS
-       emake check || die "emake check failed."
+       emake check
 }
 
 pkg_postinst() {

diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 8ea9ff10b13d88d394de29c370a1917865aeb637..51abc24c4cf26e3f768325156b456121cd878369 100644 (file)
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -4,8 +4,13 @@
        <herd>net-im</herd>
        <herd>gnome</herd>
        <use>
+               <flag name="call">Enable Call channel support using
+                       <pkg>net-libs/telepathy-farstream</pkg> for audio/video calls</flag>
                <flag name="geoloc">Enable geolocation support through
                        <pkg>app-misc/geoclue</pkg></flag>
+               <flag name="gnome-online-accounts">Enable using
+                       <pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
+                       for Google Talk)</flag>
                <flag name="map">Enable world map support through
                        <pkg>media-libs/libchamplain</pkg></flag>
                <flag name="nautilus">Enable nautilus-sendto support</flag>