summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-06-27 12:27:54 -0400
committerPatrick McLean <chutzpah@gentoo.org>2011-06-27 12:27:54 -0400
commitf0b3dd7399e205bd7894974fd8959349b77ae236 (patch)
tree088d80e2c6b773fdad73b431b3d277a543a02dc6
parentMake the gnome-keyring patch actually work. (diff)
downloadchutzpah-f0b3dd7399e205bd7894974fd8959349b77ae236.tar.gz
chutzpah-f0b3dd7399e205bd7894974fd8959349b77ae236.tar.bz2
chutzpah-f0b3dd7399e205bd7894974fd8959349b77ae236.zip
Pidgin version bump.
-rw-r--r--net-im/pidgin/Manifest31
-rw-r--r--net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch13
-rw-r--r--net-im/pidgin/pidgin-2.9.0.ebuild (renamed from net-im/pidgin/pidgin-2.8.0-r1.ebuild)10
3 files changed, 18 insertions, 36 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7f244a5..564a59b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,24 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX pidgin-2.8.0-finch-icq.patch 602 RMD160 7aa3168c557985ef2f6f4381ff0b60d3bd9c4fd1 SHA1 1d1aaf53ef0a46d486c9746cff22cc0bfa855158 SHA256 15caf0a737fb9d1e6f02dbf567107abe7121bc79f18568c2216539b80dbc7d04
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
-DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
-EBUILD pidgin-2.8.0-r1.ebuild 7052 RMD160 3a0d0b52fe9f4017323e3c7bcec680ceebe996a0 SHA1 541cd1b1b606d02ec487cc438f2e30f11bc18a71 SHA256 9da15149b7003cd1554a55e9076429e37d06e0a4e4ef35bcbf0b3594e14a293b
+DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7
+EBUILD pidgin-2.9.0.ebuild 6751 RMD160 0c4701eedbabaeceff636cb79a43c9485fbb55ca SHA1 f092f1454e4311b14f6576eb0ad6d5cb14ad5d72 SHA256 dcc988da2f20fe9ab34b829bd53a73c3259db946671ce9de720c8994b76e7aa9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJN/1nDAAoJEHy/RO9cNQiDHF0P/3A59L+TG88ab8hBNs5IiUvM
-Vy03bV6+4M66PlwjoQvfuq8A9R+waWi+/1lHDP3+58Uf61ghN4te5myEqSbX41xZ
-Wz3Ys46m58uV80bT9rNGv4GBBL68V6DlERIuBF/cVVQfbnGMNC4SXxj2wzha/Hi7
-1rEQG2GjDEZq1LY9DPokxUb1O+ysK39YukhqmeMVEJKasMgWLcEidsvjPNKiq138
-eyf0Nnc3vwRVIXRBxxIbWCcgpzyBZY20TBV8yakvP1N0AUlmjc7CeEDyGPZbCq7P
-3BMiok/sP529L93Lqd7Fw3zIkzvu7vEMhuqNnk0ow0M6Hpjs8WsTd5BVAZE6I1Hm
-6bpLSjqzXbtauERLQkx6Xa20UpWs0cr+5LOBaIIhdh4h+PXk71TEDCdoFu70QTaM
-xSTRcjEGEgAz/WnRxF1minJRMdXq9Fnp3Qh93TRevttrzoVuVR4ceHPEPSNYGrou
-guw4rjs0ZoPmffS47+QJsHSmrwJZ2KSgM0NY1UrWet5B/qBLLrGSNvj06464LWZ/
-Kuihl5GK+GqPpr/4/GyGFWyVBA5MuTWaEdj39f9PNQv3fYya0S/QhXdAYJHNCXIH
-M8tn9B42rbuZ0Gcrl2nhpiuGodOahC004WvteDs09EOoabfBVyq2QZk9eGDsVcp2
-AvIANrqb7cUdCM/ryGGf
-=EtYT
+iQIcBAEBCAAGBQJOCK96AAoJEHy/RO9cNQiDFKwP/3jO8LlDDZOSkhRsuCyq6stE
+PSf9XsclI8T4EwPuliBe6As5X2RkO3taxUUq0RgLzGI0p4yS/jyeoiuj9JG1PE07
+DurVZaAr69PmFhmYwaaEXV83OSJo1lBhh3H0kZEUforJDISjWF5DqrOw1/k3GmJj
+3LIIcJ9SPf6HJnuOWWMFmR6FM5f6xqAsfKplgtGk0CClUGRVwpd2H/w3Wfc4jlGc
+9LrdX4w8OftEQqefEBHg93wOdLk969js7jdZeQp+FmDNaHjLpqgH3VD7uR5D+8D0
+jRdvJiSM6G7/Hix346EOnLRblNGaJLGDQiN7cAfXEBrB0zobpUgWIFYZ00tj5ngJ
+bpQb1I+lRRQuNH33d1j25XALDaWhyTNyufuSuh5R/mj5R5C/RSyoi+KvqEhoifTZ
+POnncrdpUYf7OM6p81g/Ubpv+b9KL+57AToidcFvj0bXATk5iKt5unAEJUELIZkR
+UanvSiiYm++uJW2DAVG3AVnQeapK92aTiqRD7OLvMwwNeAjluf0gaGWTwBNZQmOj
+fA6WQgZyd1eO2A7zpd5caacXjd/DbrRVGcCgFxVrl5xZreJZyKMc56eL0ui3XMDx
+RAbVkBGLux2DXGZvvtFpsw4Vc54uOsyJdZ1BQfAm86bPYax8dpEOCxvqOWVH/Qmc
+Pp5iH/HjyAWBC0JlOJho
+=29Fs
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch b/net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch
deleted file mode 100644
index 18343f7..0000000
--- a/net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- A/finch/finch.c 2011-01-08 16:19:44.000000000 +0100
-+++ A/finch/finch.c 2011-06-17 14:10:21.611309935 +0200
-@@ -77,8 +77,8 @@
- * can register for your own client key at
- * http://developer.aim.com/manageKeys.jsp
- */
-- g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma19sqWV9ymU6UYc");
-- g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma19sqWV9ymU6UYc");
-+ g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9");
-+ g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9");
-
- /*
- * This is the distid for Finch, given to us by AOL. Please
diff --git a/net-im/pidgin/pidgin-2.8.0-r1.ebuild b/net-im/pidgin/pidgin-2.9.0.ebuild
index b0db163..a778e12 100644
--- a/net-im/pidgin/pidgin-2.8.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.8.0.ebuild,v 1.1 2011/06/14 10:27:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.9.0.ebuild,v 1.1 2011/06/27 12:58:22 pva Exp $
EAPI=3
@@ -48,7 +48,8 @@ RDEPEND="
>=sys-apps/dbus-0.90
dev-python/dbus-python )
perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
- gadu? ( >=net-libs/libgadu-1.11.0[ssl,gnutls] )
+ gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
gnutls? ( net-libs/gnutls )
!gnutls? ( >=dev-libs/nss-3.11 )
meanwhile? ( net-libs/meanwhile )
@@ -127,11 +128,6 @@ pkg_setup() {
}
src_prepare() {
- # Fix build issue.
- # http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin/plugins/gevolution/gevolution.c
- sed 's:\<GTK_POLICY_AUTO\>:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gevolution/gevolution.c || die
- epatch "${FILESDIR}/${P}-finch-icq.patch"
-
epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
eautoreconf
}