Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 278b8c8735ac31b221eec16d93f2419a5ab3a6d6..8404451fb8669770500330238efa9e73d6f3e7cf 100644 (file)
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.57 2010/06/21 19:27:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.58 2010/06/23 12:33:13 pacho Exp $
+
+*empathy-2.30.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org> -empathy-2.30.1.1.ebuild,
+  -files/empathy-2.30.1.1-init-gerror.patch, +empathy-2.30.2.ebuild:
+  Version bump with updated translations and fixes, remove old. Stop
+  handling nautilus-sendto automagically.
 
   21 Jun 2010; Pacho Ramos <pacho@gentoo.org> empathy-2.30.1.1.ebuild:
   Adjust deps to latest nautilus-sendto

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index dda3cbbe3dd05ee2295b1d85e502fe4530bd8373..553a260b03e9d3019138429943b428a0b192744b 100644 (file)
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -2,22 +2,21 @@
 Hash: SHA1
 
 AUX empathy-2.28-networkmanager-0.8.patch 674 RMD160 a507683f229700db3bbc82f4d75d76404655bf28 SHA1 2a4676d8e629297df7d756e8fadc4a443d86d0c5 SHA256 f5d15db62b88e8df457885f2d6d65c482c7537d605c404828f05640964433432
-AUX empathy-2.30.1.1-init-gerror.patch 696 RMD160 39482777c9d5aab1f54be06634fdd5a3fa649790 SHA1 e06e1e1553d3cd96b0572c3bae78f1b186379a50 SHA256 1794f29a5af099db032cfaf0d5bce0fb19209069f72b1ff55dd8a1c5ddd1745d
 DIST empathy-2.24.1.tar.bz2 1761446 RMD160 97e58664c1cf3977806884cc401d679ecca91365 SHA1 7c2b6434d5fd855e887e6ef27300601609706ea5 SHA256 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
 DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a33521f SHA1 d2eb4de3d3efd7728dc28eb16dfe60c64141be70 SHA256 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
 DIST empathy-2.28.2.tar.bz2 2432940 RMD160 a306be47d681c5192eb30db91792ac823ef27528 SHA1 712752a7675429215dc92e3f35106b91baa9772b SHA256 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
-DIST empathy-2.30.1.1.tar.bz2 2645135 RMD160 5d0f5de8ca81d8590b0b717150ba1af7c8b6bb7d SHA1 8896a0859068febe0e9a280301fe1f928592898f SHA256 347c3e8ebaac0af5110a5b7b8c1869dd03dc3caa2eb57589dd1ff630f3073cb7
+DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
 EBUILD empathy-2.24.1.ebuild 1899 RMD160 cec86f7a9e92da7799aac0eb64b24ac01882304b SHA1 c8ca58ddc24a49cb8c59065f1ef1ad609114fce3 SHA256 fee6f5e108894789aa826cc1871940265929fda8ee92d65eec8b3cf3af68bb46
 EBUILD empathy-2.26.2.ebuild 2458 RMD160 22232403dabf5b43f872ab0e4d19f25139a7002e SHA1 d176af1eae77dc6fb5afccfc3fa72dfa30b50e31 SHA256 540af849275cf1107df562e964c3092a279f858217e838cad20847417c9f0e28
 EBUILD empathy-2.28.2-r1.ebuild 3082 RMD160 a0e7d0c8b372de8af58bb18012b31a6abc4f3956 SHA1 eec7628d6c7a84770bd0ef159eeaab973c911a90 SHA256 052a59e324fd6464786640c79ac232ef5af2ba0f7c5175c89f3150c09d17f2cc
 EBUILD empathy-2.28.2.ebuild 2995 RMD160 5ac841b2c410fcfb060048d96845bc9ad484435e SHA1 a208d1aac8c4e38b8382b1223ae823f2fcb6e200 SHA256 380004301610861a5dd6aa035ad269673dbc88b243e8108469a3afd289272708
-EBUILD empathy-2.30.1.1.ebuild 2775 RMD160 f296812003a196ee69c9836a6b942195a3196c47 SHA1 e11a5d9e519f1ae456c575b4bce5266c56906d87 SHA256 4100700ed2ec7c1336c271526e4e9cb4ae2a5292d1d9b5aa97823d73a18ab7ac
-MISC ChangeLog 10772 RMD160 214ce72b5d2dfd7152f60fc3527be8f45b4ae6d2 SHA1 a9ae1944c1557912f8cae6bb6dda9039256f4b8f SHA256 36442ce83e38f0f1e74006e2429935f97770a0ae9e67946b44b7e22851acf5cf
+EBUILD empathy-2.30.2.ebuild 2656 RMD160 2cb4524d5611e57188fbca7e3fed4de46e5a7c27 SHA1 595873ea81e3f48a290b558403527adf45be7001 SHA256 44065f291b441ffdb6645bb1452d585b8f1d11801f90c948883c9b5604e6f7c0
+MISC ChangeLog 11056 RMD160 ca6a0a6aaa3986f438c2f8d9cbd2df93f12ae851 SHA1 3d762bf63e013ae51c381e72408d54b1a31019ce SHA256 d8ecbaa6604720c8d1485a5df35d12aac7ebaac837c0284c1f634d1fdb3c07b2
 MISC metadata.xml 937 RMD160 69906d677ab5c5d05d39a04caef2b617a25889c7 SHA1 1d6d3d10666fff0e5e937f1626a5f9ef0660cf54 SHA256 ac3b78a9174587a123a573709a0ea9e66e7ca9f7f0f05aa4ff1bf0f262b3f912
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwfvTYACgkQCaWpQKGI+9QxEACcDMEm8nIExT18x2JBRIMHetxb
-QvsAnRJCt/uZKxk29tmE9tB3t0qetZir
-=2ywY
+iEYEARECAAYFAkwh/w4ACgkQCaWpQKGI+9SB9ACcCAt6JKSPLbxCmHGEekb4Dz9/
+t0AAoIPeD6pUK57pRBAW6W9sP+G/LcKo
+=v/jM
 -----END PGP SIGNATURE-----

diff --git a/net-im/empathy/empathy-2.30.1.1.ebuild b/net-im/empathy/empathy-2.30.2.ebuild
similarity index 89%
rename from net-im/empathy/empathy-2.30.1.1.ebuild
rename to net-im/empathy/empathy-2.30.2.ebuild
index 9832fa8804b79dd1fb60eb2dba0fb73588825c21..4bf1a6d2dbc523467af750d879c39403b7d1725e 100644 (file)
--- a/net-im/empathy/empathy-2.30.1.1.ebuild
+++ b/net-im/empathy/empathy-2.30.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.1.1.ebuild,v 1.4 2010/06/21 19:27:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.2.ebuild,v 1.1 2010/06/23 12:33:13 pacho Exp $
 
 EAPI="2"
 
-inherit eutils gnome2 multilib
+inherit gnome2 multilib
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -76,19 +76,13 @@ pkg_setup() {
                --disable-favourite_contacts
                --disable-tpl
                $(use_enable debug)
+               $(use_enable nautilus nautilus-sendto)
                $(use_with networkmanager connectivity nm)
                $(use_enable spell)
                $(use_enable test coding-style-checks)
                $(use_enable webkit)"
 }
 
-src_prepare() {
-       gnome2_src_prepare
-
-       # Fix uninitialized GError*s causing tests to break, bug #323751
-       epatch "${FILESDIR}/${P}-init-gerror.patch"
-}
-
 src_test() {
        unset DBUS_SESSION_BUS_ADDRESS
        emake check || die "emake check failed."

diff --git a/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch b/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch
deleted file mode 100644 (file)
index aba40ac..0000000
--- a/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9783f0a3cf1449e2566de295b2ffa1ad17519fdc Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Tue, 15 Jun 2010 11:17:09 +0000
-Subject: init GError so 'make check' will be happy (#621409)
-
----
-diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
-index c5908a8..f616a99 100644
---- a/libempathy/empathy-dispatcher.c
-+++ b/libempathy/empathy-dispatcher.c
-@@ -344,7 +344,7 @@ dispatcher_connection_invalidated_cb (TpConnection *connection,
-   if (connection_data != NULL)
-     {
-       GList *l;
--      GError *error;
-+      GError *error = NULL;
- 
-       error = g_error_new_literal (domain, code, message);
- 
---
-cgit v0.8.3.1