summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-06-19 09:57:31 -0400
committerPatrick McLean <chutzpah@gentoo.org>2011-06-19 09:57:31 -0400
commit32250b4b95683c654683a9aa1b98d97ca48d1ccf (patch)
tree6e79a3e5f9366bf10268345891bbfe97a7eee299
parentPidgin version bump (diff)
downloadchutzpah-32250b4b95683c654683a9aa1b98d97ca48d1ccf.tar.gz
chutzpah-32250b4b95683c654683a9aa1b98d97ca48d1ccf.tar.bz2
chutzpah-32250b4b95683c654683a9aa1b98d97ca48d1ccf.zip
Version bump..
-rw-r--r--net-im/pidgin/Manifest29
-rw-r--r--net-im/pidgin/files/pidgin-2.7.3-ldflags.patch24
-rw-r--r--net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch13
-rw-r--r--net-im/pidgin/pidgin-2.8.0-r1.ebuild (renamed from net-im/pidgin/pidgin-2.8.0.ebuild)2
4 files changed, 30 insertions, 38 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index dbeb45e..4818e2a 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,23 +2,26 @@
Hash: SHA256
AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
+AUX pidgin-2.8.0-finch-icq.patch 602 RMD160 7aa3168c557985ef2f6f4381ff0b60d3bd9c4fd1 SHA1 1d1aaf53ef0a46d486c9746cff22cc0bfa855158 SHA256 15caf0a737fb9d1e6f02dbf567107abe7121bc79f18568c2216539b80dbc7d04
AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
+EBUILD pidgin-2.8.0-r1.ebuild 7019 RMD160 91f4eed8a8132c4cf74268da2de9b9d82bfb192c SHA1 6bf3a1167b58935d504e8cf4b752f486b65877af SHA256 786de94f196e221b397e9d505c544cfc72b7a4662c349d6fcbe14d6a97d65d74
EBUILD pidgin-2.8.0.ebuild 7008 RMD160 9f8dda528cdfc98096661fe3a755ee62678f092d SHA1 28c7d53b5bf6bd8a9ddf914a5d550937c696a16a SHA256 4948c69a339f19cd13f30af944eb03d0a37d943ed8b9ea0d51da77e611113d90
+MISC Manifest.asc 9389 RMD160 ee7d50d5e58de76073f5eacb82b5ec9d1e1e21ae SHA1 6058c6f890dfa6d601226c0e8c672d4805a8cd5a SHA256 255ecc6f5262745db290ea97748b77c1a6a201d7f65f7139ad865a525c585a22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJN+RjFAAoJEHy/RO9cNQiD+Z4QAKL5VVuOYIyvTitA31HW3nsf
-X8sJ7tUCIQagbVICV4mU6sd9fOVBRPagEmjKUKY4nj0KYZxjTNGtqbXckgjQYZti
-G3QGOuDXLlW4ggvL775pOCjjXar1UzUTFWklLnChju3wtCxhtKXdkNq+/63XPVWq
-nkmIar9wA4j3EqC0fclk+8BD/njJHNPWupCA2Em/no2OtEAKyOb6OFOfAQiZadan
-ibtKq8STvCzlxMcYFC7W9HSnTM6Lu5YfLBHAHrgEJZgD2ecvb1fxfXkwf7DBB+Nt
-UwobwkrK3Dve9Lg4ohWDZmVJDZc4fVx87QfqmK+IUnGFYF6kt9hS3AUs92co6HXS
-BZF3Hq+az53WW/vEZqZ5KQ43FUnXOz1DA7DNtB6gXhP0q5OgUH+izlpFk2IJnVOO
-QiPl49PwvJSVM6CUVYhwpD4A+atByQJg3ZyWuzSf9OA23i4SQ4N/WO7gaLd6aXsO
-vknwbIdmTqpG6B2Lu4QyhJPKMc2KPkTp4Lz1wolM3294sDx7ysMQ0r6FBxtgx84V
-JdUZgiUn/AmK6ottMS6qvLq7GHSJs8wvwsfUFSE1ZbQv0wn7McDf1MQWHsZrgUVY
-Bp9KvwUSwpn3uXsmnInJekGY5IDLNv1ffNtNe45XFVyKwdTktAAW6JEZJ2ulcRg3
-7GhjWdxXyFq7QXS3q+LL
-=iSd0
+iQIcBAEBCAAGBQJN/gAaAAoJEHy/RO9cNQiDZaIP/0qYx0HGa6+FbubJWsKgB5Ra
+kiSU5vTXaKEji6prA8uvnelqJyJVEc8Td/1GsdDsqfZXr+UMXj19fabHMX4T2HUd
+eX5GnmNr/Ag0PyHLdvnilf/THW/Z258u9ycVFNJhObLwn3frx7flhpcQDZEUkO68
+Nty8uFqra7DjWNDw9xC3jCd2TVE07YBfNWgBnNqheRBAaBC1OvQnINvr0Na4qled
+HVl2z39j8rXLGQuXOxE8Z2JjG42Ynx942Q/D+UWmFzXTYFtG1uhw3RcvAdK6wZOZ
+uIFq2rX7Zq4lW5RinfLY+AAIdFDokGeDfSxhmQbJnWzpuT+HM4FN5vbLGI+3BkM/
+MckK587gCzn5jt4rjpihFiT6ZTt7CYgzCRPZbcX3wDjHqpWSvMlXP88oEyrgMji/
+3Tx0maCUIhJ4V3/srmMu4zfvILV+9DgvwiXPPGC93U63bAjQeyBQEHp9HWkKlUWK
+n7BBmY1wB5iiLG7GD+yEE0sCenrq5Kqr5ZdoIGUCrBSvBhVa7P0RYD4K6g1C7Atq
+GNL4r6Vz6SUVlxrpl/o6Rxt4/7RjdkAdqp/dh6p4eDEgMWxbOYOXoxHre18AxUUQ
+rCbwInRU3hEqpWpECNWw6/paxB286kka1fNSjIaopingm64B/ySl1ofshzmOD0y/
+XTVbK8cIRQDEk6u00g4y
+=zD/4
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch
deleted file mode 100644
index 145858b..0000000
--- a/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://developer.pidgin.im/ticket/12638
-
---- libpurple/plugins/perl/common/Makefile.PL.in 2010-08-31 07:25:25 +0000
-+++ libpurple/plugins/perl/common/Makefile.PL.in 2010-08-31 07:25:52 +0000
-@@ -10,6 +10,7 @@
- (ABSTRACT_FROM => '@srcdir@/Purple.pm', # finds $ABSTRACT
- AUTHOR => 'Purple <http://pidgin.im/>') : ()),
- 'DEFINE' => '@DEBUG_CFLAGS@',
-+ 'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
- 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@',
- 'OBJECT' => '$(O_FILES)', # link all the C files too
- # 'OPTIMIZE' => '-g', # For debugging
-
---- pidgin/plugins/perl/common/Makefile.PL.in 2010-08-31 07:25:25 +0000
-+++ pidgin/plugins/perl/common/Makefile.PL.in 2010-08-31 07:26:10 +0000
-@@ -9,6 +9,7 @@
- ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT
- 'AUTHOR' => 'Pidgin <http://pidgin.im/>') : ()),
- 'DEFINE' => '@DEBUG_CFLAGS@',
-+ 'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
- 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@',
- 'OBJECT' => '$(O_FILES)', # link all the C files too
- 'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
-
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
new file mode 100644
index 0000000..18343f7
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch
@@ -0,0 +1,13 @@
+--- 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.ebuild b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
index b84fc69..dca1a5a 100644
--- a/net-im/pidgin/pidgin-2.8.0.ebuild
+++ b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
@@ -130,6 +130,7 @@ 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-1.patch
eautoreconf
}
@@ -193,7 +194,6 @@ src_configure() {
$(use_enable doc doxygen) \
$(use_enable networkmanager nm) \
$(use_enable zeroconf avahi) \
- $(use_enable gnome-keyring) \
$(use_enable idn) \
--with-system-ssl-certs="/etc/ssl/certs/" \
--with-dynamic-prpls="${DYNAMIC_PRPLS}" \