* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-06-19 13:57 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-06-19 13:57 UTC (permalink / raw
To: gentoo-commits
commit: 32250b4b95683c654683a9aa1b98d97ca48d1ccf
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:57:31 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:57:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=32250b4b
Version bump..
---
net-im/pidgin/Manifest | 29 +++++++++++---------
net-im/pidgin/files/pidgin-2.7.3-ldflags.patch | 24 ----------------
net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch | 13 +++++++++
...{pidgin-2.8.0.ebuild => pidgin-2.8.0-r1.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
similarity index 99%
rename from net-im/pidgin/pidgin-2.8.0.ebuild
rename to 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}" \
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-06-20 14:52 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-06-20 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 8402212a7b1433553fbfbf8c57294aba8e6166e2
Author: Patrick McLean <patrick <AT> cim <DOT> mcgill <DOT> ca>
AuthorDate: Mon Jun 20 14:52:33 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 14:52:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=8402212a
Make the gnome-keyring patch actually work.
---
net-im/pidgin/Manifest | 30 +++---
...eyring-1.patch => pidgin-gnome-keyring-2.patch} | 115 ++++++++++----------
net-im/pidgin/pidgin-2.8.0-r1.ebuild | 4 +-
3 files changed, 78 insertions(+), 71 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7c9fa09..7f244a5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,23 +2,23 @@
Hash: SHA256
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
+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 7019 RMD160 91f4eed8a8132c4cf74268da2de9b9d82bfb192c SHA1 6bf3a1167b58935d504e8cf4b752f486b65877af SHA256 786de94f196e221b397e9d505c544cfc72b7a4662c349d6fcbe14d6a97d65d74
+EBUILD pidgin-2.8.0-r1.ebuild 7052 RMD160 3a0d0b52fe9f4017323e3c7bcec680ceebe996a0 SHA1 541cd1b1b606d02ec487cc438f2e30f11bc18a71 SHA256 9da15149b7003cd1554a55e9076429e37d06e0a4e4ef35bcbf0b3594e14a293b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCAAGBQJN/gCJAAoJEHy/RO9cNQiDay4P/3FH28N9snDtnYfr+5VpRQRa
-jrmj7BVRYWYffnIP6cahY0Huc2Ony1uGLe1GRf+OKT2txVk922Pqm637IoVAVS4A
-gPkUrME0AneowYZeyt59T3pm0+ql/YHZYAdxna9fot23CeQs3s5jJrK6eiIjy9c0
-+lxblQC1M8oca+0AU0NJn/WHHG1W2vulFCHbOyoVSvh4hNnsQirD/qNi0YVm31Oh
-LoJOmBnJpJmQC0aHQZ3A834VLPzOjMot3F2xnqw8/cSptAzzVtNauD/8qtW6QETq
-OXPiggBbfebSxqgZrV+W6MjXDuR7eqksOCjTh3fTh9UTsjihgQxUtssXOLHzDQSG
-rnz+U6EaSECQFF98WpdKMh4A6uKIOcgjA87xvYiTraSahaArOvOVjfcaMSBJrKUk
-/AKwNGWQpzPT8O7l6fKgG1mtwcrZchZUHHHCKEJXtgclX24Urb0kiPbPSQgDF+Gw
-3WanXCTd4yh9VaolqrfEtp9Si+jhq1CMKj4vJ+NkC8ZaOC0FR40uFEfHfMiJsnKT
-eDCLE7W8W9G8OM60nLDvBLZO2NQezz/b+A9Llki10A73lam7tgYY+60EHqQWaPp+
-3pcovqRl868sOQ5Om8mg5j8Yuc8AXYb9IAeHGzdUOH+dKw4SjrzbTEwUBr+gKvRU
-nQw/cos6pPiiCCXBnSQ5
-=rNrw
+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
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch b/net-im/pidgin/files/pidgin-gnome-keyring-2.patch
similarity index 71%
rename from net-im/pidgin/files/pidgin-gnome-keyring-1.patch
rename to net-im/pidgin/files/pidgin-gnome-keyring-2.patch
index fec338e..a15633c 100644
--- a/net-im/pidgin/files/pidgin-gnome-keyring-1.patch
+++ b/net-im/pidgin/files/pidgin-gnome-keyring-2.patch
@@ -1,7 +1,7 @@
-diff -ur pidgin-2.7.1.orig/configure.ac pidgin-2.7.1/configure.ac
---- pidgin-2.7.1.orig/configure.ac 2010-05-29 21:23:56.000000000 -0400
-+++ pidgin-2.7.1/configure.ac 2010-07-20 23:25:59.520998076 -0400
-@@ -2393,6 +2393,20 @@
+diff -ur pidgin-2.8.0.orig//configure.ac pidgin-2.8.0/configure.ac
+--- pidgin-2.8.0.orig//configure.ac 2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/configure.ac 2011-06-20 10:16:33.000000000 -0400
+@@ -2379,6 +2379,20 @@
LDFLAGS="$orig_LDFLAGS"
fi
@@ -21,29 +21,11 @@ diff -ur pidgin-2.7.1.orig/configure.ac pidgin-2.7.1/configure.ac
+
AC_MSG_CHECKING(for me pot o' gold)
AC_MSG_RESULT(no)
- AC_CHECK_FUNCS(gethostid lrand48)
-diff -ur pidgin-2.7.1.orig/libpurple/Makefile.am pidgin-2.7.1/libpurple/Makefile.am
---- pidgin-2.7.1.orig/libpurple/Makefile.am 2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1/libpurple/Makefile.am 2010-07-20 23:25:59.529007791 -0400
-@@ -307,6 +307,7 @@
- $(DBUS_LIBS) \
- $(GLIB_LIBS) \
- $(LIBXML_LIBS) \
-+ $(PIDGIN_KEYRING_LIBS) \
- $(NETWORKMANAGER_LIBS) \
- $(INTLLIBS) \
- $(FARSIGHT_LIBS) \
-@@ -323,6 +324,7 @@
- $(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(DBUS_CFLAGS) \
-+ $(PIDGIN_KEYRING_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(FARSIGHT_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
-diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
---- pidgin-2.7.1.orig/libpurple/account.c 2010-05-29 21:23:57.000000000 -0400
-+++ pidgin-2.7.1/libpurple/account.c 2010-07-20 23:25:59.528013217 -0400
+ AC_CHECK_FUNCS(gethostid lrand48 timegm)
+Only in pidgin-2.8.0: configure.ac.orig
+diff -ur pidgin-2.8.0.orig//libpurple/account.c pidgin-2.8.0/libpurple/account.c
+--- pidgin-2.8.0.orig//libpurple/account.c 2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/libpurple/account.c 2011-06-20 10:19:17.000000000 -0400
@@ -49,6 +49,13 @@
#define PURPLE_ACCOUNT_GET_PRIVATE(account) \
((PurpleAccountPrivate *) (account->priv))
@@ -51,19 +33,19 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
+#ifdef PIDGIN_ENABLE_KEYRING
+#include <gnome-keyring.h>
+
-+static char * gaim_account_get_password_from_keyring (const char *_prpl, const char *_user);
-+static gboolean gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
++static char * pidgin_account_get_password_from_keyring (const char *_prpl, const char *_user);
++static gboolean pidgin_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
+#endif
+
/* TODO: Should use PurpleValue instead of this? What about "ui"? */
typedef struct
{
-@@ -378,8 +385,13 @@
+@@ -379,8 +386,13 @@
if (purple_account_get_remember_password(account) &&
((tmp = purple_account_get_password(account)) != NULL))
{
+#ifdef PIDGIN_ENABLE_KEYRING
-+ gaim_account_set_password_in_keyring( purple_account_get_protocol_id(account),
++ pidgin_account_set_password_in_keyring(purple_account_get_protocol_id(account),
+ purple_account_get_username(account), tmp);
+#else
child = xmlnode_new_child(node, "password");
@@ -72,7 +54,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
}
if ((tmp = purple_account_get_alias(account)) != NULL)
-@@ -828,17 +840,30 @@
+@@ -875,17 +887,30 @@
}
ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@@ -89,7 +71,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
- }
+ gboolean got_pwd = FALSE;
+#ifdef PIDGIN_ENABLE_KEYRING
-+ data = gaim_account_get_password_from_keyring(protocol_id, name);
++ data = pidgin_account_get_password_from_keyring(protocol_id, name);
+ if (data)
+ {
+ got_pwd = TRUE;
@@ -114,14 +96,14 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
/* Read the alias */
child = xmlnode_get_child(node, "alias");
-@@ -3064,3 +3089,61 @@
+@@ -3245,3 +3270,61 @@
purple_signals_disconnect_by_handle(handle);
purple_signals_unregister_by_instance(handle);
}
+
+#ifdef PIDGIN_ENABLE_KEYRING
+static char *
-+gaim_account_get_password_from_keyring(const char *_prpl, const char *_user)
++pidgin_account_get_password_from_keyring(const char *_prpl, const char *_user)
+{
+ GnomeKeyringNetworkPasswordData *found_item;
+ GnomeKeyringResult result;
@@ -156,7 +138,7 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
+}
+
+static gboolean
-+gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
++pidgin_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
+{
+ GnomeKeyringResult result;
+ guint32 item_id;
@@ -176,28 +158,30 @@ diff -ur pidgin-2.7.1.orig/libpurple/account.c pidgin-2.7.1/libpurple/account.c
+ return result == GNOME_KEYRING_RESULT_OK;
+}
+#endif
-diff -ur pidgin-2.7.1.orig/pidgin/Makefile.am pidgin-2.7.1/pidgin/Makefile.am
---- pidgin-2.7.1.orig/pidgin/Makefile.am 2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1/pidgin/Makefile.am 2010-07-20 23:25:59.530998309 -0400
-@@ -161,6 +161,7 @@
- $(GTKSPELL_LIBS) \
- $(STARTUP_NOTIFICATION_LIBS) \
+Only in pidgin-2.8.0/libpurple: account.c.orig
+diff -ur pidgin-2.8.0.orig//libpurple/Makefile.am pidgin-2.8.0/libpurple/Makefile.am
+--- pidgin-2.8.0.orig//libpurple/Makefile.am 2011-06-07 04:44:40.000000000 -0400
++++ pidgin-2.8.0/libpurple/Makefile.am 2011-06-20 10:16:33.000000000 -0400
+@@ -305,6 +305,7 @@
+ $(DBUS_LIBS) \
+ $(GLIB_LIBS) \
$(LIBXML_LIBS) \
+ $(PIDGIN_KEYRING_LIBS) \
- $(GTK_LIBS) \
- $(top_builddir)/libpurple/libpurple.la
-
-@@ -181,6 +182,7 @@
- $(GSTREAMER_CFLAGS) \
+ $(NETWORKMANAGER_LIBS) \
+ $(INTLLIBS) \
+ $(FARSIGHT_LIBS) \
+@@ -322,6 +323,7 @@
+ $(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \
- $(GTK_CFLAGS) \
-+ $(PIDGIN_KEYRING_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GTKSPELL_CFLAGS) \
- $(STARTUP_NOTIFICATION_CFLAGS) \
-diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
---- pidgin-2.7.1.orig/pidgin/gtkmain.c 2010-05-29 21:24:00.000000000 -0400
-+++ pidgin-2.7.1/pidgin/gtkmain.c 2010-07-20 23:25:59.529007791 -0400
++ $(PIDGIN_KEYRING_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(FARSIGHT_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
+Only in pidgin-2.8.0/libpurple: Makefile.am.orig
+diff -ur pidgin-2.8.0.orig//pidgin/gtkmain.c pidgin-2.8.0/pidgin/gtkmain.c
+--- pidgin-2.8.0.orig//pidgin/gtkmain.c 2011-06-07 04:44:41.000000000 -0400
++++ pidgin-2.8.0/pidgin/gtkmain.c 2011-06-20 10:16:33.000000000 -0400
@@ -70,6 +70,10 @@
#include "pidginstock.h"
#include "gtkwhiteboard.h"
@@ -209,7 +193,7 @@ diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
-@@ -793,6 +797,12 @@
+@@ -742,6 +746,12 @@
gtk_rc_add_default_file(search_path);
g_free(search_path);
@@ -222,3 +206,24 @@ diff -ur pidgin-2.7.1.orig/pidgin/gtkmain.c pidgin-2.7.1/pidgin/gtkmain.c
gui_check = gtk_init_check(&argc, &argv);
if (!gui_check) {
char *display = gdk_get_display();
+Only in pidgin-2.8.0/pidgin: gtkmain.c.orig
+diff -ur pidgin-2.8.0.orig//pidgin/Makefile.am pidgin-2.8.0/pidgin/Makefile.am
+--- pidgin-2.8.0.orig//pidgin/Makefile.am 2011-06-07 04:44:41.000000000 -0400
++++ pidgin-2.8.0/pidgin/Makefile.am 2011-06-20 10:16:33.000000000 -0400
+@@ -157,6 +157,7 @@
+ $(INTLLIBS) \
+ $(GTKSPELL_LIBS) \
+ $(LIBXML_LIBS) \
++ $(PIDGIN_KEYRING_LIBS) \
+ $(GTK_LIBS) \
+ $(top_builddir)/libpurple/libpurple.la
+
+@@ -177,6 +178,7 @@
+ $(GSTREAMER_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(GTK_CFLAGS) \
++ $(PIDGIN_KEYRING_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GTKSPELL_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+Only in pidgin-2.8.0/pidgin: Makefile.am.orig
diff --git a/net-im/pidgin/pidgin-2.8.0-r1.ebuild b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
index dca1a5a..b0db163 100644
--- a/net-im/pidgin/pidgin-2.8.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
@@ -131,7 +131,8 @@ src_prepare() {
# 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
+
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
eautoreconf
}
@@ -188,6 +189,7 @@ src_configure() {
$(use_enable dbus) \
$(use_enable meanwhile) \
$(use_enable gstreamer) \
+ $(use_enable gnome-keyring) \
$(use_enable gstreamer farsight) \
$(use_enable gstreamer vv) \
$(use_enable sasl cyrus-sasl ) \
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-06-27 16:28 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-06-27 16:28 UTC (permalink / raw
To: gentoo-commits
commit: f0b3dd7399e205bd7894974fd8959349b77ae236
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 16:27:54 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 16:27:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=f0b3dd73
Pidgin version bump.
---
net-im/pidgin/Manifest | 31 +++++++++----------
net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch | 13 --------
...{pidgin-2.8.0-r1.ebuild => pidgin-2.9.0.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
similarity index 92%
rename from net-im/pidgin/pidgin-2.8.0-r1.ebuild
rename to 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
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-08-23 18:12 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-08-23 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 427a7f84451d7b0a2b58871aa5073d856c567d22
Author: Patrick McLean <patrick <AT> cim <DOT> mcgill <DOT> ca>
AuthorDate: Tue Aug 23 18:12:01 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:12:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=427a7f84
version bump
---
net-im/pidgin/Manifest | 22 +--
.../pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 ++
net-im/pidgin/pidgin-2.9.0-r1.ebuild | 224 ++++++++++++++++++++
3 files changed, 243 insertions(+), 20 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 564a59b..4a66b99 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,23 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7
+EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1bfbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8ed962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2
EBUILD pidgin-2.9.0.ebuild 6751 RMD160 0c4701eedbabaeceff636cb79a43c9485fbb55ca SHA1 f092f1454e4311b14f6576eb0ad6d5cb14ad5d72 SHA256 dcc988da2f20fe9ab34b829bd53a73c3259db946671ce9de720c8994b76e7aa9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-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.9.0-conversation.c.patch b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
new file mode 100644
index 0000000..bf09668
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+# from [cd6817f4863abafef969359f65cc025f9483b401]
+# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ }
+
+ g_hash_table_remove_all(chat->users);
+- chat->users = NULL;
+
+ g_list_free(users);
+ chat->in_room = NULL;
diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.9.0-r1.ebuild
new file mode 100644
index 0000000..5ac3889
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.9.0-r1.ebuild
@@ -0,0 +1,224 @@
+# 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.9.0-r1.ebuild,v 1.1 2011/07/27 07:01:12 pva Exp $
+
+EAPI=3
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" gnome-keyring"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses[unicode]
+ dbus? ( <dev-lang/python-3 )
+ python? ( <dev-lang/python-3 ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2 )
+ eds? ( gnome-extra/evolution-data-server )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-libs/gst-plugins-good-0.10*
+ >=net-libs/farsight2-0.0.14
+ media-plugins/gst-plugins-meta
+ media-plugins/gst-plugins-gconf )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=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]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/nss-3.11 )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl )
+ tk? ( dev-lang/tk )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( <dev-lang/python-3 )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgimpd
+# x11-plugins/pidgin-birthday
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-mbpurple
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use dbus || { use ncurses && use python; }; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/pidgin-2.9.0-conversation.c.patch"
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=$(PYTHON)"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ --disable-silent-rules \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_enable gnome-keyring) \
+ $(use_enable gstreamer farsight) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes=/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && fixlocalpod
+
+ find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-10-03 6:48 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-10-03 6:48 UTC (permalink / raw
To: gentoo-commits
commit: 785c2ab423c444564a671621733885812ab51f68
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 03:47:07 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 03:47:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=785c2ab4
pidgin revision bump
---
net-im/pidgin/Manifest | 25 ++++++++++++++++--
.../files/pidgin-2.10.0-utf8-validation.patch | 27 ++++++++++++++++++++
.../pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 ------------
...gin-2.9.0-r1.ebuild => pidgin-2.10.0-r1.ebuild} | 9 +++---
4 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 482fbed..00aacc1 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,6 +1,25 @@
-AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
-DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7
+EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da
EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c
-EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1bfbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8ed962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOiS/kAAoJEHy/RO9cNQiDjpoP/juj0ibdg3AotfwGS23Q3zSX
+9PyywtP99odsHZf9ryzx5fjf0M4J99Tc8wgt1cwwLYUzfCTFhZYJVE7bMmaFI6GG
+x0P+FeD8YWmNC3vxkyQt1/mPnju06LKFIo9dSAezlC4mLOJNdZDtPOu9Rdgkxt3G
+4mwRSCMVFjGE6Pe0I7VltlH84c7zxe5bcbkA9z4ewSLR2s6mfa8hb0UzgODJBMGv
+baCVKF1GKL91popPSQiOvU+mnLkkbLPGrhKiCkr7Bc2fvLHKGi+swrT+SgcGs3Qw
+k+7tv4zXnRdbARNe4dB19rjRkIkDNMl+08PwJkX0Vkz3ghLcD762ACg4RtdBm6yC
+80bjXe1O1UNulXaQAAR4y4o36cUarHuqqSG1FMRJGhSLkuKgVligJpnZaieuTdTT
+XEmX1QmhlIvWI2ru6L+hXQvw/1W7ac6aZgKxRdJ/Q8xRkyGxLIXy4MdPMvMKCJo/
+81u0B8j+/BwtwBYzkwcTlq7m54Unrlk3Uyvz9tKcWg4gMV8uFCpK0hJ6C9Q9DKbQ
+tFvIGqLjIg6PPRiM2WL5IG7oM+apc6gCTNhMFPlyX0VXjd8A2N48i369XU6230vM
+ctQ3l8yTJN9QIboC+a9hwzUT8UiOq8DBv/2FUHijqonjEBtYSc536yFiKCgpaROU
+VdKdL5c9WLLfmfxl2GbN
+=gMM7
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch b/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch
new file mode 100644
index 0000000..26ee178
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch
@@ -0,0 +1,27 @@
+#
+#
+# patch "libpurple/protocols/silc/ops.c"
+# from [30ab18780af11a53b6564a44c4e8ebfc1a296d78]
+# to [80bd9a7d3faf9e5ef28438647159fe19847e9839]
+#
+============================================================
+--- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
++++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
+@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
+ }
+
+ if (flags & SILC_MESSAGE_FLAG_UTF8) {
+- tmp = g_markup_escape_text((const char *)message, -1);
++ const char *msg = (const char *)message;
++ char *salvaged = NULL;
++ if (!g_utf8_validate((const char *)message, -1, NULL)) {
++ salvaged = purple_utf8_salvage((const char *)message);
++ msg = salvaged;
++ }
++ tmp = g_markup_escape_text(msg, -1);
+ /* Send to Purple */
+ serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
++ g_free(salvaged);
+ g_free(tmp);
+ }
+ }
diff --git a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
deleted file mode 100644
index bf09668..0000000
--- a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#
-# patch "libpurple/conversation.c"
-# from [cd6817f4863abafef969359f65cc025f9483b401]
-# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
-#
-============================================================
---- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401
-+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803
-@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
- }
-
- g_hash_table_remove_all(chat->users);
-- chat->users = NULL;
-
- g_list_free(users);
- chat->in_room = NULL;
diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.10.0-r1.ebuild
similarity index 96%
rename from net-im/pidgin/pidgin-2.9.0-r1.ebuild
rename to net-im/pidgin/pidgin-2.10.0-r1.ebuild
index 5ac3889..b50ad5d 100644
--- a/net-im/pidgin/pidgin-2.9.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.10.0-r1.ebuild
@@ -1,11 +1,12 @@
# 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.9.0-r1.ebuild,v 1.1 2011/07/27 07:01:12 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.0-r1.ebuild,v 1.1 2011/10/02 18:13:16 pva Exp $
EAPI=3
GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+inherit autotools
DESCRIPTION="GTK Instant Messenger client"
HOMEPAGE="http://pidgin.im/"
@@ -128,9 +129,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/pidgin-2.9.0-conversation.c.patch"
+ epatch "${FILESDIR}/${P}-utf8-validation.patch"
epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
- eautoreconf
+ eautoreconf || die "eautoreconf failed"
}
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-10-28 1:16 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-10-28 1:16 UTC (permalink / raw
To: gentoo-commits
commit: 70e25842065cb8040b61db2c12cf667ef4a15f29
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 01:15:37 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 01:15:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=70e25842
pidgin version bump
---
net-im/pidgin/Manifest | 28 ++--
net-im/pidgin/files/pidgin-2.10.0-gold.patch | 30 ++++
net-im/pidgin/pidgin-2.10.0-r2.ebuild | 234 ++++++++++++++++++++++++++
3 files changed, 279 insertions(+), 13 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 00aacc1..0406619 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,25 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb
AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da
+EBUILD pidgin-2.10.0-r2.ebuild 7097 RMD160 f1863d895cd6970470c6de2e15c588da28706ff7 SHA1 7c62d84323b093f7cd9b1c4bcda2d439ebcfe411 SHA256 c6d17d2384c89cd7d687a7e1099b665895b5224f8e9701b7d21dd790cf2ee497
EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJOiS/kAAoJEHy/RO9cNQiDjpoP/juj0ibdg3AotfwGS23Q3zSX
-9PyywtP99odsHZf9ryzx5fjf0M4J99Tc8wgt1cwwLYUzfCTFhZYJVE7bMmaFI6GG
-x0P+FeD8YWmNC3vxkyQt1/mPnju06LKFIo9dSAezlC4mLOJNdZDtPOu9Rdgkxt3G
-4mwRSCMVFjGE6Pe0I7VltlH84c7zxe5bcbkA9z4ewSLR2s6mfa8hb0UzgODJBMGv
-baCVKF1GKL91popPSQiOvU+mnLkkbLPGrhKiCkr7Bc2fvLHKGi+swrT+SgcGs3Qw
-k+7tv4zXnRdbARNe4dB19rjRkIkDNMl+08PwJkX0Vkz3ghLcD762ACg4RtdBm6yC
-80bjXe1O1UNulXaQAAR4y4o36cUarHuqqSG1FMRJGhSLkuKgVligJpnZaieuTdTT
-XEmX1QmhlIvWI2ru6L+hXQvw/1W7ac6aZgKxRdJ/Q8xRkyGxLIXy4MdPMvMKCJo/
-81u0B8j+/BwtwBYzkwcTlq7m54Unrlk3Uyvz9tKcWg4gMV8uFCpK0hJ6C9Q9DKbQ
-tFvIGqLjIg6PPRiM2WL5IG7oM+apc6gCTNhMFPlyX0VXjd8A2N48i369XU6230vM
-ctQ3l8yTJN9QIboC+a9hwzUT8UiOq8DBv/2FUHijqonjEBtYSc536yFiKCgpaROU
-VdKdL5c9WLLfmfxl2GbN
-=gMM7
+iQIcBAEBCAAGBQJOqgHvAAoJEHy/RO9cNQiD3XMP/jfqFGT3uQvGZxrM5gZeAX21
+JLBOFCN7yShoixZfqbzr6QdpXgHEoSxnNjNRdbK2xTWiHSv0gQIU9Uq6kgm5/Yz/
+PgVHTM8KfVYCf/uCZlTJIFpR/vZmdEyxxQr1Td40CETFX1Dkp3w+axfHyl0qurve
+9fa2+eGENmoARjnIjNvkBoK0mBi+rkG5qVoBUmUksIuFTaghypTpxVdJyQzlXxFb
+gDPoyHYJuLLomjtcbhZ6Pk8zGh2rLnGIQA0yyHKMbIY9fvSPrI1grjnHalguMYh1
++sB95Vt5xA35JHsGsSku7RN4EvmnqImtKSPLFgB1dlg27/psW/OlMN1L3fj/SmSO
+xU5cE+Ugm3iNzJRGRsIzTURfKa+QHAqk0T/iFDTgIhyAv/SxCiyujegn2U/PjxtD
+xp0NfAMKb1KBpUslyfoSq9WpqwPp11+KMmPh7053U5IXoATKO7o7iH7Y5JTApiD+
+BPb8bSFclO0+B7YVBgOg3K0sF9RHPryD+cBUOh3DxGle7Xe+LF8FvLRtUsLvRqLS
++JtrQo3GIRGdpSpCuwb/GnIUE2DXz/7bHgCDtlzvps1wTnhOqixgu/Rir+2q41HD
+AMfjmg4Nmh8l0UhFs4qI0L6Z95Rp7uc+wd/gaoaSTnIojrmbbPkYVJ0JEaphds7n
+SVTe5Q5SCDz+wBLLPBuQ
+=WpEK
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
new file mode 100644
index 0000000..819bfdc
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
@@ -0,0 +1,30 @@
+ pidgin/Makefile.am | 2 +-
+ pidgin/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
+index b6a5bd4..96d207d 100644
+--- a/pidgin/Makefile.am
++++ b/pidgin/Makefile.am
+@@ -158,7 +158,7 @@ pidgin_LDADD = \
+ $(GTKSPELL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(GTK_LIBS) \
+- $(top_builddir)/libpurple/libpurple.la
++ $(top_builddir)/libpurple/libpurple.la -lm
+
+ if USE_INTERNAL_LIBGADU
+ INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
+index 615c196..0293e5c 100644
+--- a/pidgin/Makefile.in
++++ b/pidgin/Makefile.in
+@@ -607,7 +607,7 @@ EXTRA_DIST = \
+ @ENABLE_GTK_TRUE@ $(GTKSPELL_LIBS) \
+ @ENABLE_GTK_TRUE@ $(LIBXML_LIBS) \
+ @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
+-@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
++@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la -lm
+
+ @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
diff --git a/net-im/pidgin/pidgin-2.10.0-r2.ebuild b/net-im/pidgin/pidgin-2.10.0-r2.ebuild
new file mode 100644
index 0000000..5c6f887
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.0-r2.ebuild
@@ -0,0 +1,234 @@
+# 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.10.0-r2.ebuild,v 1.1 2011/10/27 08:28:21 jlec Exp $
+
+EAPI=3
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+inherit autotools
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" gnome-keyring"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses[unicode]
+ dbus? ( <dev-lang/python-3 )
+ python? ( <dev-lang/python-3 ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( gnome-extra/evolution-data-server )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-libs/gst-plugins-good-0.10*
+ >=net-libs/farsight2-0.0.14
+ media-plugins/gst-plugins-meta
+ media-plugins/gst-plugins-gconf )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=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]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/nss-3.11 )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl )
+ tk? ( dev-lang/tk )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( <dev-lang/python-3 )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use dbus || { use ncurses && use python; }; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-utf8-validation.patch" \
+ "${FILESDIR}/${P}-gold.patch"
+
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
+ eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=$(PYTHON)"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ --disable-silent-rules \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_enable gnome-keyring) \
+ $(use_enable gstreamer farsight) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes=/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && fixlocalpod
+
+ find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2011-12-12 21:51 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2011-12-12 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 81bbd6fb46eb538823c1ad0df493d58aea8a7011
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 21:50:42 2011 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 21:50:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=81bbd6fb
pidgin version bump
---
net-im/pidgin/Manifest | 29 ++-
.../files/pidgin-2.10.0-networkmanager-0.9.patch | 51 +++++
net-im/pidgin/pidgin-2.10.1.ebuild | 235 ++++++++++++++++++++
3 files changed, 302 insertions(+), 13 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 0406619..40618e2 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,26 +2,29 @@
Hash: SHA256
AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb
+AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab
AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
+DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da
EBUILD pidgin-2.10.0-r2.ebuild 7097 RMD160 f1863d895cd6970470c6de2e15c588da28706ff7 SHA1 7c62d84323b093f7cd9b1c4bcda2d439ebcfe411 SHA256 c6d17d2384c89cd7d687a7e1099b665895b5224f8e9701b7d21dd790cf2ee497
EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c
+EBUILD pidgin-2.10.1.ebuild 7147 RMD160 7ab996af7067ab7764a9944c2903a98e4d3816c1 SHA1 cfc748af3d532119cdb8dcd6271045a59b7dbbd7 SHA256 814bfb9f568980ebc848ad5fa8b31b24c71b2d2e6e19b5c4b81f22208257781d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJOqgHvAAoJEHy/RO9cNQiD3XMP/jfqFGT3uQvGZxrM5gZeAX21
-JLBOFCN7yShoixZfqbzr6QdpXgHEoSxnNjNRdbK2xTWiHSv0gQIU9Uq6kgm5/Yz/
-PgVHTM8KfVYCf/uCZlTJIFpR/vZmdEyxxQr1Td40CETFX1Dkp3w+axfHyl0qurve
-9fa2+eGENmoARjnIjNvkBoK0mBi+rkG5qVoBUmUksIuFTaghypTpxVdJyQzlXxFb
-gDPoyHYJuLLomjtcbhZ6Pk8zGh2rLnGIQA0yyHKMbIY9fvSPrI1grjnHalguMYh1
-+sB95Vt5xA35JHsGsSku7RN4EvmnqImtKSPLFgB1dlg27/psW/OlMN1L3fj/SmSO
-xU5cE+Ugm3iNzJRGRsIzTURfKa+QHAqk0T/iFDTgIhyAv/SxCiyujegn2U/PjxtD
-xp0NfAMKb1KBpUslyfoSq9WpqwPp11+KMmPh7053U5IXoATKO7o7iH7Y5JTApiD+
-BPb8bSFclO0+B7YVBgOg3K0sF9RHPryD+cBUOh3DxGle7Xe+LF8FvLRtUsLvRqLS
-+JtrQo3GIRGdpSpCuwb/GnIUE2DXz/7bHgCDtlzvps1wTnhOqixgu/Rir+2q41HD
-AMfjmg4Nmh8l0UhFs4qI0L6Z95Rp7uc+wd/gaoaSTnIojrmbbPkYVJ0JEaphds7n
-SVTe5Q5SCDz+wBLLPBuQ
-=WpEK
+iQIcBAEBCAAGBQJO5nbeAAoJEHy/RO9cNQiDkO4P/0pwtBcAwsWtYQfvlp/n4UZ7
+0g7Ri62LfOIHsPzGjUaq3qwed5E61R4bfiEm3F6PQZHnbOcZtjz5bAJmfJo/J07w
+yNJmLG9h920RaVNu4AHcvl5oiHHV97T6vLJhIjJ7Ki6NLQ82Yi/wiv7xZbEA9dGd
+wIISVCxYB2XnijxgKBfXxP3tRGSVu0lm0sldMVssN+zyiZRtv9TyU0FzQuozWYvr
+bAL7w3+BEpceUt7YTqOncy09eAejF0uWx22RvaLPqZAs0cl3fdKOQxJ5Wx0N6V9M
+hZOIqxVjn/PAI7KenAZ8AzgmlO2zbWBx3zOZf5vv4aNG3qehKuNx2S/0rCHMVSct
+aDa+AbKfSDDSx7BDXoJ5elxmOakZoYKSN3X6bh0Aa4FCOKhFZCwdtbhg/NqFeYKM
+7wX6GFkO/TtuS25uY9cynG2LO5Gxd5oErQGx9vRfyRirsISXmQbEXMt9KmUza2xD
+QzszdFJW1mg8sDTq9AooTGQU2pw7wPHV/uqXVHaDGBjYkjLy7x2B+lS+rCF5379c
+FaoU6wbPTvZM/qi6ocVlDLGKjJridvvzt+EottEcDYHimiKJTDExxk15gc8WAeKY
+UDeIljJXDpHfd+CnWtfzG0EkRdyFdOeFIodxkrGolLgpPmpmb39xHGjXXsZoTOEE
+N1eB0dOHf6SioUgF8GwJ
+=IJiD
-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch
new file mode 100644
index 0000000..8b5c1a7
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch
@@ -0,0 +1,51 @@
+http://developer.pidgin.im/ticket/13859
+
+diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
+--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500
++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500
+@@ -833,8 +833,20 @@ purple_network_is_available(void)
+ purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
+ }
+
+- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
+- return TRUE;
++ switch (nm_state)
++ {
++ case NM_STATE_UNKNOWN:
++#if NM_CHECK_VERSION(0,8,992)
++ case NM_STATE_CONNECTED_LOCAL:
++ case NM_STATE_CONNECTED_SITE:
++ case NM_STATE_CONNECTED_GLOBAL:
++#else
++ case NM_STATE_CONNECTED:
++#endif
++ return TRUE;
++ default:
++ break;
++ }
+
+ return FALSE;
+
+@@ -1170,9 +1182,14 @@ purple_network_init(void)
+ NM_DBUS_SERVICE,
+ NM_DBUS_PATH,
+ NM_DBUS_INTERFACE);
++ /* NM 0.6 signal */
+ dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
+ G_CALLBACK(nm_state_change_cb), NULL, NULL);
++ /* NM 0.7 and later signal */
++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
++ G_CALLBACK(nm_state_change_cb), NULL, NULL);
+
+ dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
+ DBUS_SERVICE_DBUS,
+@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
+ #ifdef HAVE_NETWORKMANAGER
+ if (nm_proxy) {
+ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
+ g_object_unref(G_OBJECT(nm_proxy));
+ }
+ if (dbus_proxy) {
diff --git a/net-im/pidgin/pidgin-2.10.1.ebuild b/net-im/pidgin/pidgin-2.10.1.ebuild
new file mode 100644
index 0000000..ef400d6
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.1.ebuild
@@ -0,0 +1,235 @@
+# 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.10.1.ebuild,v 1.1 2011/12/12 18:28:21 pva Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
+inherit autotools
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" gnome-keyring"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses[unicode]
+ dbus? ( <dev-lang/python-3 )
+ python? ( <dev-lang/python-3 ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( gnome-extra/evolution-data-server )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-libs/gst-plugins-good-0.10*
+ >=net-libs/farsight2-0.0.14
+ media-plugins/gst-plugins-meta
+ media-plugins/gst-plugins-gconf )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=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]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/nss-3.11 )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl )
+ tk? ( dev-lang/tk )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( <dev-lang/python-3 )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use dbus || { use ncurses && use python; }; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
+ epatch "${FILESDIR}/${PN}-2.10.0-networkmanager-0.9.patch"
+
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
+ eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=$(PYTHON)"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ --disable-silent-rules \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_enable gnome-keyring) \
+ $(use_enable gstreamer farsight) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes=/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && fixlocalpod
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2013-03-11 18:05 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2013-03-11 18:05 UTC (permalink / raw
To: gentoo-commits
commit: c6c8a825dd2479b48496d3f117a6116a9f3a3a1b
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 18:05:00 2013 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 18:05:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=c6c8a825
add new patch
---
net-im/pidgin/Manifest | 1 +
net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index c29885e..2d78242 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,6 +1,7 @@
AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512 9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9 WHIRLPOOL d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
+AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
DIST pidgin-2.10.6.tar.bz2 10007092 SHA256 3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96 SHA512 fffc8721ebe5dbaa53c213ec07a6ad5045ba336829cf9bce11aef8b5968f0f0b49289cfe1818e183a3807b6b8b7ebb75387a81d7135835859e0188a05f3be1ef WHIRLPOOL 7d044ad2cad68e223c3c20d867b4ebf23956982b9ecbc1f91264857abea2555b6ae07b963671eaa49fd2b85d648b6f5692c561e0cc060fb0762458880b5e9145
DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
diff --git a/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch b/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
new file mode 100644
index 0000000..701f386
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Daniel Atallah <datallah@pidgin.im>
+# Date 1360879082 0
+# Node ID a860609d9c9ee20a64ca5284f7b50cbc57ae5c92
+# Parent 75999131f023b369df6d4f5b2001e153b448be13
+Fix from David Walser for a crash in the CAP plugin.
+
+diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
+--- a/pidgin/plugins/cap/cap.c
++++ b/pidgin/plugins/cap/cap.c
+@@ -43,7 +43,7 @@
+ int threshold = purple_prefs_get_int("/plugins/gtk/cap/threshold");
+ int min_minute = (current_minute - threshold) % 1440;
+ int max_minute = (current_minute + threshold) % 1440;
+- char *sql, sta_id = NULL;
++ char *sql, *sta_id = NULL;
+ sqlite3_stmt *stmt = NULL;
+ const char *tail = NULL;
+ int rc;
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2013-03-23 1:29 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2013-03-23 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 32b626e56fe7c581dde0e9c8c349f92894ace26c
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 01:29:00 2013 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 01:29:00 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=32b626e5
add missing patch
---
net-im/pidgin/Manifest | 1 +
.../pidgin-2.10.7-link_sasl_in_irc_plugin.patch | 21 ++++++++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index e44b677..3d31590 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,7 @@ AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da6
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512 9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9 WHIRLPOOL d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
+AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
DIST pidgin-2.10.6.tar.bz2 10007092 SHA256 3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96 SHA512 fffc8721ebe5dbaa53c213ec07a6ad5045ba336829cf9bce11aef8b5968f0f0b49289cfe1818e183a3807b6b8b7ebb75387a81d7135835859e0188a05f3be1ef WHIRLPOOL 7d044ad2cad68e223c3c20d867b4ebf23956982b9ecbc1f91264857abea2555b6ae07b963671eaa49fd2b85d648b6f5692c561e0cc060fb0762458880b5e9145
DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
diff --git a/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch b/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
new file mode 100644
index 0000000..10cc0a0
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.7-link_sasl_in_irc_plugin.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Daniel Atallah <datallah@pidgin.im>
+# Date 1362972661 14400
+# Node ID 944ec96bb1037a24435fcdc487f9568197ff5b1d
+# Parent 12fe7c5bfccf80e145470a5a8a4018c53e75b3d8
+Patch from Evangelos Foutras to link to CyrusSASL from the IRC plugin when needed. Fixes #15517
+
+diff --git a/libpurple/protocols/irc/Makefile.am b/libpurple/protocols/irc/Makefile.am
+--- a/libpurple/protocols/irc/Makefile.am
++++ b/libpurple/protocols/irc/Makefile.am
+@@ -27,7 +27,7 @@
+ st =
+ pkg_LTLIBRARIES = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD = $(GLIB_LIBS)
++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
+
+ endif
+
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2013-06-20 23:46 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2013-06-20 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 618975b3c1cb81971452a2264f1b710f2d503cf8
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 23:45:51 2013 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 23:45:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=618975b3
add in the eds patch from upstream, un-bzipped (?!?!)
---
net-im/pidgin/Manifest | 3 +-
net-im/pidgin/files/pidgin-eds-3.6.patch | 330 +++++++++++++++++++++++++++++++
net-im/pidgin/pidgin-2.10.7-r2.ebuild | 2 +-
3 files changed, 333 insertions(+), 2 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 8b116b8..74ab887 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,6 +3,7 @@ AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
+AUX pidgin-eds-3.6.patch 9895 SHA256 f7dcb08b14cbb2320a01afb59a815f8e11890cf9c4134e59f5551d60950b0feb SHA512 a936ef9c92f90ae6f82b41637bfb5434aaec459b5ebaf679676e1a5035a84ff88edad9a55aa09e8939c47b8634018036a62457b5dee6db821c63aba104b938a0 WHIRLPOOL 89b915ca597a44af6775c40a99e0cdd169c3e2737e356d6ecaf1eefb82439062ba2c902650c8fa82efbbce1fb6d14086204bd52abdf6da29de8d11576f1b26dd
AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
-EBUILD pidgin-2.10.7-r2.ebuild 7402 SHA256 0a6a7906df1d135e32224da6ba8dab510bf5f899b684a08cf9058d82fb8f8678 SHA512 f31d7e40d98da70a0f6984e8426a1c61732bfbe863b1fe3d54cb677920d0f197a98dd02794438b7d1d11b3c90e04bef9952d005222bb8b4009fbe7a90c37863c WHIRLPOOL 657edb183841f37081ee0516bf8bb1489bb8b2f09536fe2f9e56b2d3be242212d4d11d1cca18bd047685c08151c2dabf30216c40bd73a00743dc1e91357d5518
+EBUILD pidgin-2.10.7-r2.ebuild 7398 SHA256 293abf9d22387c476eb121b876aa7224b713b54c27a871c49928320f067f6ff9 SHA512 dc730b1b2fd3fbeed19a87a918dba1a48dec9c09693c01f4a5fe912a824fbe2886d77929eb16be0567921323a24a11b45348bea9c8460edea041e71bb9a8e657 WHIRLPOOL 222d863c0ac110bcaffac671204bfa66dd642d3f871bd2fbfef1d336d838311ede5fdfab130e44e3eb83b3711cf8b10972374dfe9ff7ac087048f678393e1de0
diff --git a/net-im/pidgin/files/pidgin-eds-3.6.patch b/net-im/pidgin/files/pidgin-eds-3.6.patch
new file mode 100644
index 0000000..b217907
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-eds-3.6.patch
@@ -0,0 +1,330 @@
+diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
+index 0169847..216bce2 100644
+--- a/pidgin/plugins/gevolution/add_buddy_dialog.c
++++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
+@@ -227,7 +227,7 @@ add_ims(GevoAddBuddyDialog *dialog, EContact *contact, const char *name,
+ }
+
+ static void
+-populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
++populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uid)
+ {
+ EBookQuery *query;
+ EBook *book;
+@@ -250,7 +250,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
+
+ gtk_list_store_clear(dialog->model);
+
+- if (!gevo_load_addressbook(uri, &book, &err))
++ if (!gevo_load_addressbook(uid, &book, &err))
+ {
+ purple_debug_error("evolution",
+ "Error retrieving default addressbook: %s\n", err->message);
+@@ -333,16 +333,16 @@ static void
+ addrbook_change_cb(GtkComboBox *combo, GevoAddBuddyDialog *dialog)
+ {
+ GtkTreeIter iter;
+- const char *esource_uri;
++ const char *esource_uid;
+
+ if (!gtk_combo_box_get_active_iter(combo, &iter))
+ return;
+
+ gtk_tree_model_get(GTK_TREE_MODEL(dialog->addrbooks), &iter,
+- ADDRBOOK_COLUMN_URI, &esource_uri,
++ ADDRBOOK_COLUMN_UID, &esource_uid,
+ -1);
+
+- populate_treeview(dialog, esource_uri);
++ populate_treeview(dialog, esource_uid);
+ }
+
+ static void
+diff --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
+index cbe5f90..ae18feb 100644
+--- a/pidgin/plugins/gevolution/assoc-buddy.c
++++ b/pidgin/plugins/gevolution/assoc-buddy.c
+@@ -130,7 +130,7 @@ add_columns(GevoAssociateBuddyDialog *dialog)
+ }
+
+ static void
+-populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uri)
++populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uid)
+ {
+ EBook *book;
+ EBookQuery *query;
+@@ -154,7 +154,7 @@ populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uri)
+
+ gtk_list_store_clear(dialog->model);
+
+- if (!gevo_load_addressbook(uri, &book, &err))
++ if (!gevo_load_addressbook(uid, &book, &err))
+ {
+ purple_debug_error("evolution",
+ "Error retrieving addressbook: %s\n", err->message);
+@@ -241,16 +241,16 @@ static void
+ addrbook_change_cb(GtkComboBox *combo, GevoAssociateBuddyDialog *dialog)
+ {
+ GtkTreeIter iter;
+- const char *esource_uri;
++ const char *esource_uid;
+
+ if (!gtk_combo_box_get_active_iter(combo, &iter))
+ return;
+
+ gtk_tree_model_get(GTK_TREE_MODEL(dialog->addrbooks), &iter,
+- ADDRBOOK_COLUMN_URI, &esource_uri,
++ ADDRBOOK_COLUMN_UID, &esource_uid,
+ -1);
+
+- populate_treeview(dialog, esource_uri);
++ populate_treeview(dialog, esource_uid);
+ }
+
+ static void
+diff --git a/pidgin/plugins/gevolution/eds-utils.c b/pidgin/plugins/gevolution/eds-utils.c
+index 0ecb286..dbd9b76 100644
+--- a/pidgin/plugins/gevolution/eds-utils.c
++++ b/pidgin/plugins/gevolution/eds-utils.c
+@@ -52,9 +52,9 @@ gevo_addrbooks_model_unref(GtkTreeModel *model)
+ void
+ gevo_addrbooks_model_populate(GtkTreeModel *model)
+ {
+- ESourceList *addressbooks;
++ ESourceRegistry *registry;
+ GError *err = NULL;
+- GSList *groups, *g;
++ GList *sources, *s;
+ GtkTreeIter iter;
+ GtkListStore *list;
+
+@@ -63,7 +63,9 @@ gevo_addrbooks_model_populate(GtkTreeModel *model)
+
+ list = GTK_LIST_STORE(model);
+
+- if (!e_book_get_addressbooks(&addressbooks, &err))
++ registry = e_source_registry_new_sync(NULL, &err);
++
++ if (!registry)
+ {
+ purple_debug_error("evolution",
+ "Unable to fetch list of address books.\n");
+@@ -71,57 +73,53 @@ gevo_addrbooks_model_populate(GtkTreeModel *model)
+ gtk_list_store_append(list, &iter);
+ gtk_list_store_set(list, &iter,
+ ADDRBOOK_COLUMN_NAME, _("None"),
+- ADDRBOOK_COLUMN_URI, NULL,
++ ADDRBOOK_COLUMN_UID, NULL,
+ -1);
+
++ g_clear_error(&err);
+ return;
+ }
+
+- groups = e_source_list_peek_groups(addressbooks);
++ sources = e_source_registry_list_sources(registry, E_SOURCE_EXTENSION_ADDRESS_BOOK);
+
+- if (groups == NULL)
++ if (sources == NULL)
+ {
++ g_object_unref(registry);
+ gtk_list_store_append(list, &iter);
+ gtk_list_store_set(list, &iter,
+ ADDRBOOK_COLUMN_NAME, _("None"),
+- ADDRBOOK_COLUMN_URI, NULL,
++ ADDRBOOK_COLUMN_UID, NULL,
+ -1);
+
+ return;
+ }
+
+- for (g = groups; g != NULL; g = g->next)
++ for (s = sources; s != NULL; s = s->next)
+ {
+- GSList *sources, *s;
+-
+- sources = e_source_group_peek_sources(g->data);
+-
+- for (s = sources; s != NULL; s = s->next)
+- {
+- ESource *source = E_SOURCE(s->data);
++ ESource *source = E_SOURCE(s->data);
+
+- g_object_ref(source);
++ g_object_ref(source);
+
+- gtk_list_store_append(list, &iter);
+- gtk_list_store_set(list, &iter,
+- ADDRBOOK_COLUMN_NAME, e_source_peek_name(source),
+- ADDRBOOK_COLUMN_URI, e_source_get_uri(source),
+- -1);
+- }
++ gtk_list_store_append(list, &iter);
++ gtk_list_store_set(list, &iter,
++ ADDRBOOK_COLUMN_NAME, e_source_get_display_name(source),
++ ADDRBOOK_COLUMN_UID, e_source_get_uid(source),
++ -1);
+ }
+
+- g_object_unref(addressbooks);
++ g_object_unref(registry);
++ g_list_free_full(sources, g_object_unref);
+ }
+
+ static EContact *
+-gevo_run_query_in_uri(const gchar *uri, EBookQuery *query)
++gevo_run_query_in_source(ESource *source, EBookQuery *query)
+ {
+ EBook *book;
+ gboolean status;
+ GList *cards;
+ GError *err = NULL;
+
+- if (!gevo_load_addressbook(uri, &book, &err))
++ if (!gevo_load_addressbook_from_source(source, &book, &err))
+ {
+ purple_debug_error("evolution",
+ "Error retrieving addressbook: %s\n", err->message);
+@@ -172,10 +170,10 @@ gevo_run_query_in_uri(const gchar *uri, EBookQuery *query)
+ EContact *
+ gevo_search_buddy_in_contacts(PurpleBuddy *buddy, EBookQuery *query)
+ {
+- ESourceList *addressbooks;
++ ESourceRegistry *registry;
+ GError *err = NULL;
+ EBookQuery *full_query;
+- GSList *groups, *g;
++ GList *sources, *s;
+ EContact *result;
+ EContactField protocol_field = gevo_prpl_get_field(buddy->account, buddy);
+
+@@ -207,7 +205,9 @@ gevo_search_buddy_in_contacts(PurpleBuddy *buddy, EBookQuery *query)
+ }
+ }
+
+- if (!e_book_get_addressbooks(&addressbooks, &err))
++ registry = e_source_registry_new_sync(NULL, &err);
++
++ if (!registry)
+ {
+ purple_debug_error("evolution",
+ "Unable to fetch list of address books.\n");
+@@ -217,30 +217,21 @@ gevo_search_buddy_in_contacts(PurpleBuddy *buddy, EBookQuery *query)
+ return NULL;
+ }
+
+- groups = e_source_list_peek_groups(addressbooks);
+- if (groups == NULL)
+- {
+- g_object_unref(addressbooks);
+- e_book_query_unref(full_query);
+- return NULL;
+- }
++ sources = e_source_registry_list_sources(registry, E_SOURCE_EXTENSION_ADDRESS_BOOK);
+
+- for (g = groups; g != NULL; g = g->next)
++ for (s = sources; s != NULL; s = s->next)
+ {
+- GSList *sources, *s;
+- sources = e_source_group_peek_sources(g->data);
+- for (s = sources; s != NULL; s = s->next)
+- {
+- result = gevo_run_query_in_uri(e_source_get_uri(E_SOURCE(s->data)), full_query);
+- if (result != NULL) {
+- g_object_unref(addressbooks);
+- e_book_query_unref(full_query);
+- return result;
+- }
++ result = gevo_run_query_in_source(E_SOURCE(s->data), full_query);
++ if (result != NULL) {
++ g_object_unref(registry);
++ g_list_free_full(sources, g_object_unref);
++ e_book_query_unref(full_query);
++ return result;
+ }
+ }
+
+- g_object_unref(addressbooks);
++ g_object_unref(registry);
++ g_list_free_full(sources, g_object_unref);
+ e_book_query_unref(full_query);
+ return NULL;
+ }
+diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
+index 8f97a7d..23ac7ed 100644
+--- a/pidgin/plugins/gevolution/gevo-util.c
++++ b/pidgin/plugins/gevolution/gevo-util.c
+@@ -124,16 +124,39 @@ gevo_prpl_is_supported(PurpleAccount *account, PurpleBuddy *buddy)
+ }
+
+ gboolean
+-gevo_load_addressbook(const gchar* uri, EBook **book, GError **error)
++gevo_load_addressbook(const gchar* uid, EBook **book, GError **error)
+ {
+ gboolean result = FALSE;
++ ESourceRegistry *registry;
++ ESource *source;
+
+ g_return_val_if_fail(book != NULL, FALSE);
+
+- if (uri == NULL)
+- *book = e_book_new_system_addressbook(error);
++ registry = e_source_registry_new_sync(NULL, error);
++
++ if (!registry)
++ return FALSE;
++
++ if (uid == NULL)
++ source = e_source_registry_ref_default_address_book(registry);
+ else
+- *book = e_book_new_from_uri(uri, error);
++ source = e_source_registry_ref_source(registry, uid);
++
++ g_object_unref(registry);
++
++ result = gevo_load_addressbook_from_source(source, book, error);
++
++ g_object_unref(source);
++
++ return result;
++}
++
++gboolean
++gevo_load_addressbook_from_source(ESource *source, EBook **book, GError **error)
++{
++ gboolean result = FALSE;
++
++ *book = e_book_new(source, error);
+
+ if (*book == NULL)
+ return FALSE;
+diff --git a/pidgin/plugins/gevolution/gevolution.h b/pidgin/plugins/gevolution/gevolution.h
+index 1b92b2b..1bd5208 100644
+--- a/pidgin/plugins/gevolution/gevolution.h
++++ b/pidgin/plugins/gevolution/gevolution.h
+@@ -25,12 +25,12 @@
+ # include "config.h"
+ #endif
+
+-#include <libebook/e-book.h>
++#include <libebook/libebook.h>
+
+ enum
+ {
+ ADDRBOOK_COLUMN_NAME,
+- ADDRBOOK_COLUMN_URI,
++ ADDRBOOK_COLUMN_UID,
+ NUM_ADDRBOOK_COLUMNS
+ };
+
+@@ -123,7 +123,9 @@ GList *gevo_get_groups(void);
+
+ EContactField gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy);
+ gboolean gevo_prpl_is_supported(PurpleAccount *account, PurpleBuddy *buddy);
+-gboolean gevo_load_addressbook(const gchar *uri, EBook **book, GError **error);
++gboolean gevo_load_addressbook(const gchar *uid, EBook **book, GError **error);
++gboolean gevo_load_addressbook_from_source(ESource *source, EBook **book,
++ GError **error);
+ char *gevo_get_email_for_buddy(PurpleBuddy *buddy);
+
+ GevoAssociateBuddyDialog *gevo_associate_buddy_dialog_new(PurpleBuddy *buddy);
diff --git a/net-im/pidgin/pidgin-2.10.7-r2.ebuild b/net-im/pidgin/pidgin-2.10.7-r2.ebuild
index 8ec0371..338cf44 100644
--- a/net-im/pidgin/pidgin-2.10.7-r2.ebuild
+++ b/net-im/pidgin/pidgin-2.10.7-r2.ebuild
@@ -141,7 +141,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
"${FILESDIR}/${P}-fix-cap.patch" \
"${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
- "${FILESDIR}/${PN}-eds-3.6.patch.bz2"
+ "${FILESDIR}/${PN}-eds-3.6.patch"
epatch_user
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2014-11-26 18:27 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2014-11-26 18:27 UTC (permalink / raw
To: gentoo-commits
commit: af0ae9267b80f3e917becad923fa41abe730af1b
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 26 18:26:55 2014 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Nov 26 18:26:55 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=af0ae926
net-im/pidgin: version bump to follow upstream, clean out old versions
---
net-im/pidgin/Manifest | 13 +-
.../pidgin-2.10.10-eds-3.6-configure.ac.patch | 23 ++
...pidgin-2.10.10.ebuild => pidgin-2.10.11.ebuild} | 9 +-
net-im/pidgin/pidgin-2.10.7-r2.ebuild | 243 --------------------
net-im/pidgin/pidgin-2.10.7-r3.ebuild | 243 --------------------
net-im/pidgin/pidgin-2.10.7-r5.ebuild | 243 --------------------
net-im/pidgin/pidgin-2.10.8-r1.ebuild | 241 --------------------
net-im/pidgin/pidgin-2.10.9-r1.ebuild | 246 ---------------------
8 files changed, 31 insertions(+), 1230 deletions(-)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index e6ddba3..c08150b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,20 +1,13 @@
AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512 9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9 WHIRLPOOL d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
+AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 SHA256 548d459f17970d963147db19a2959b19da7d1f6c1958ae3ed3b609cf6be8b775 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0 WHIRLPOOL 55183fdb3057a79e367566196abfa368962202eca3f63676cb80d791e0c0baa9245d67733b88d6af523524ec9d0ed941fe284552fe1bdfd91daf1b33ca67ffed
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256 c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd WHIRLPOOL 3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
AUX pidgin-eds-3.6.patch 9895 SHA256 f7dcb08b14cbb2320a01afb59a815f8e11890cf9c4134e59f5551d60950b0feb SHA512 a936ef9c92f90ae6f82b41637bfb5434aaec459b5ebaf679676e1a5035a84ff88edad9a55aa09e8939c47b8634018036a62457b5dee6db821c63aba104b938a0 WHIRLPOOL 89b915ca597a44af6775c40a99e0cdd169c3e2737e356d6ecaf1eefb82439062ba2c902650c8fa82efbbce1fb6d14086204bd52abdf6da29de8d11576f1b26dd
AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
AUX pidgin-gnome-keyring-3.patch 8966 SHA256 4cf873682a4e2d7218f14f498a3c38d982b46175ef57fb8022b607528d2d844e SHA512 5786a0baa9d874fda882a7d9955e0b2c4234fef3db3957130c4b9ebc580412a6217fbb8da538c1451d7d34c3ce1d404eaa4037486e72e091c2bcc22c97bda30f WHIRLPOOL 72c23432a50837d78c9d7dceafe9a069a871e50750f4f7d194bb1818bc0aca99d9634c0c1d5c90a33cb375d48c837781f679b256de169de7018594b492108b80
-DIST pidgin-2.10.10.tar.bz2 9409485 SHA256 dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d SHA512 79c6e0b382b24b1f9208337afaf5a11de8701b7e4b84be94696df8f7d36d8126eba935144e9b764c50d98a2cc9cdcd7d26891f9d9f93924a8a7065b0540c5d37 WHIRLPOOL 5351bf6cadb3215c246dbabdc75e5f400600516bfa3864a48b647d280ba2736fb29c86717da229ff2a5fe12e57e9154ca60a3be4edda94481cdc98b0c3ec0647
-DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
-DIST pidgin-2.10.8.tar.bz2 10050465 SHA256 b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227 SHA512 68ec93c6f7b5f98519e58796929cc3d7064125cee2ff41ea7582d368fee210a2799eac48ba2caf4faaf21a8932ca62328781c2bfc6a6fe8bd3023b725bacd93b WHIRLPOOL fbcc978a19a0178527d37cbced468c34e21fcebd7430fdaa89ea8e5d9473f78be42fa255d537d620f2ddbde08729178b366505ec9d0717c281a5ea0cd14f4929
-DIST pidgin-2.10.9.tar.bz2 10093423 SHA256 dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319 SHA512 5f85d072997bf0e8c668b5a7dc6c9791f7f1b03504eb7a875472186cc70b45e19c61573d84c002f9653570731ed2119e3eddfb66d7484cc1205d4b1ee696c63b WHIRLPOOL aa9862ebb8e45ad488049ea27960ddbaa80abe3a535acf09b496b917ae858d799db8f7cc0b1ab034bfabe4b8d3e730cd3d413c18f3552d677f3c563e7482c016
+DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
-EBUILD pidgin-2.10.10.ebuild 7473 SHA256 c543b6add2542489ae340b4bba354cb81ba6bf50f33c99a5c80258af50252643 SHA512 3634986cf87379eb3faaac870f96af3eb6ac4676fdc1f7b796804798d67a966a5ba39af4144ad8d76b7906ac2c07f70da5fc7f507599afc50c054a9d939467fd WHIRLPOOL 7fd1641ffc5449a2dc9a84fd5be72afc2cfb4f646427496daeac5fe69a0be7de1b50bebdb13c624c1bbfe4ad4f1d6f064d5deeb49df4efab969fe3988fd7cb02
-EBUILD pidgin-2.10.7-r2.ebuild 7449 SHA256 b55f944b2ce88ab2e2221a6d13186ca75efe47cee1fb06bc45ea1f519605dfaa SHA512 fb5a8ecbaae054aa4440156bcc926e27210161cf7cade128664b90bdafb7ede32f17ee191c4348bcba95f9fdf739c015a815ad0ffcdec13af6d9477b577895c9 WHIRLPOOL 457bc547c4498b527f05ba17a2c54b5a97c7a99bec45af69d5b813d9e3d98556a6f87a8364365ca2493d2ae8d4fcb8db069a37ded65e6be1f97dc8dd7571f424
-EBUILD pidgin-2.10.7-r3.ebuild 7484 SHA256 795114bf7178f7892c7e54c7c526ea8838d4b18640df77190754af15b2da5f7d SHA512 2aaa2040a9797c4d93db9b6a0bf7fba2ab03ad93e1c414361e1021c2043f746b98bb9a2a02128c450e4aacfb7d781792282ae6a39b6396355cce6d737b3638d0 WHIRLPOOL 19982016e0d70c007eaa41610e3bd5b8b323ca8b43ee0472bf4179f63f8d21648bea6a3d8e93dc27d874ebae52d39bc2005cf155697ffff767aba6e9bdf4581a
-EBUILD pidgin-2.10.7-r5.ebuild 7488 SHA256 10161c24d7d991f489087ebd758c4c6d6744017946cb7d3da6a966dda9d1d538 SHA512 ca16bdd784bc7a34fa05c769a811543c635627f4e6ad012dd6481ecd4a57f383d18ee7b5e435bc24a82ce8d650e7e8b89019cb55b92f826bd50e3fca1ec331b7 WHIRLPOOL be73a7a9a98a981da9ee1f02c7e974f99cc00d6ca1ef74b7a0ea641ab2b60b7c23530618ee559a2a51436a96f461f886cda1fb2130ea69bb1949b6192aba1d9f
-EBUILD pidgin-2.10.8-r1.ebuild 7397 SHA256 e8a6dc0195716b5ec9b1fffe6819e53a8a08a048c121996c0842733390d45108 SHA512 4fe6a19721f1f772786a544c8c39e1d9a6c4a2c9b1656f4d3d975d029b6cd4511885af082e809908e202c4aa681a5903384dd710c4fa21caedcb8bfdf2b4bffe WHIRLPOOL 555430c9e40a80e62109a8b847c97bc240d5e42ce5e4a0e6fb9fcfdac3eb9456196a690f212585367fff3aab51c8b6548d915dc6ad07c9808f938e320898a02d
-EBUILD pidgin-2.10.9-r1.ebuild 7503 SHA256 736c4eac331fb83fcf97090d8b5f9541e9eca1dc2f83a6c1d89fbbf5555e3869 SHA512 614cdeca4f84bf379840a6114a98e94536d1ede8b83736ff7819841dfd97d936974f8d776ba69ce5915ae7a24a98587f5b74a1943b37714aa4db67c8279437aa WHIRLPOOL 51b86ffbccf2341b457e3acdf8896769b4a31e747e3125f8a1994f383156c114225fc27019be5d2f343d20a35fb20650c401f0ebec8f9392d40ca63b38b007c7
+EBUILD pidgin-2.10.11.ebuild 7541 SHA256 22226232e8f1c941cdf6769529cf11a137b31a25da87ac2e7ca7b38fe88563f3 SHA512 5f35cefb5012c73b0974ef019d1af56042cce35ab17f49e503bf00ac0b72c7a2869d28e837d1e5b3bda1984c511161de1bdc5c1f445f2db841ac40e5e07197e5 WHIRLPOOL 9c02539c1c0e8bec3ea0ee76c214dcf446976aaa58ff6b14452acf68cd906683fb9cce9525e080976603fa09639b2dca6adea133ea8bacd91cd27359b8307b93
diff --git a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
new file mode 100644
index 0000000..555ef8c
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
@@ -0,0 +1,23 @@
+diff -urN pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
+--- pidgin-2.10.10.orig/configure.ac 2014-10-17 04:19:33.000000000 +0400
++++ pidgin-2.10.10/configure.ac 2014-10-28 15:56:27.853702740 +0300
+@@ -569,18 +569,10 @@
+ dnl # Check for stuff needed by the Evolution integration plugin.
+ dnl #######################################################################
+ if test "x$enable_gevolution" = "xyes"; then
+- evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
++ evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 >= 3.6"
+ PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
+ enable_gevolution="no"
+ ])
+- if test "x$enable_gevolution" = "xno"; then
+- evo_deps="libebook-1.0 libedata-book-1.0"
+- PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
+- enable_gevolution="yes"
+- ], [
+- enable_gevolution="no"
+- ])
+- fi
+ if test "x$enable_gevolution" = "xyes"; then
+ AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
+ AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/net-im/pidgin/pidgin-2.10.10.ebuild b/net-im/pidgin/pidgin-2.10.11.ebuild
similarity index 95%
rename from net-im/pidgin/pidgin-2.10.10.ebuild
rename to net-im/pidgin/pidgin-2.10.11.ebuild
index 1b235ba..617ec31 100644
--- a/net-im/pidgin/pidgin-2.10.10.ebuild
+++ b/net-im/pidgin/pidgin-2.10.11.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.10.ebuild,v 1.1 2014/10/22 20:40:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.11.ebuild,v 1.1 2014/11/25 17:07:38 polynomial-c Exp $
EAPI=5
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
DESCRIPTION="GTK Instant Messenger client"
@@ -140,7 +140,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
"${WORKDIR}/${PN}-eds-3.6.patch" \
- "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
+ "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch" \
+ "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
epatch_user
epatch "${FILESDIR}/pidgin-gnome-keyring-3.patch"
@@ -232,7 +233,7 @@ src_install() {
popd >/dev/null
done
fi
- use perl && fixlocalpod
+ use perl && perl_delete_localpod
if use python || use dbus ; then
python_fix_shebang "${D}"
diff --git a/net-im/pidgin/pidgin-2.10.7-r2.ebuild b/net-im/pidgin/pidgin-2.10.7-r2.ebuild
deleted file mode 100644
index 104724e..0000000
--- a/net-im/pidgin/pidgin-2.10.7-r2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r2.ebuild,v 1.2 2013/06/20 14:07:40 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-IUSE+=" gnome-keyring"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
- >=dev-libs/glib-2.16
- >=dev-libs/libxml2-2.6.18
- gnome-keyring? ( gnome-base/gnome-keyring )
- ncurses? ( sys-libs/ncurses[unicode]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} ) )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6 )
- prediction? ( >=dev-db/sqlite-3.3:3 ) )
- gstreamer? ( =media-libs/gstreamer-0.10*
- =media-libs/gst-plugins-good-0.10*
- || ( net-libs/farstream:0.1 net-libs/farsight2 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gconf:0.10 )
- zeroconf? ( net-dns/avahi[dbus] )
- dbus? ( >=dev-libs/dbus-glib-0.71
- >=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]
- >=net-libs/libgadu-1.11.0[-ssl] ) )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( >=dev-libs/nss-3.11 )
- meanwhile? ( net-libs/meanwhile )
- silc? ( >=net-im/silc-toolkit-1.0.1 )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn )
- !<x11-plugins/pidgin-facebookchat-1.69-r1"
- # Mono support crashes pidgin
- #mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
- dev-lang/perl
- dev-perl/XML-Parser
- virtual/pkgconfig
- gtk? ( x11-proto/scrnsaverproto
- ${NLS_DEPEND} )
- dbus? ( ${PYTHON_DEPS} )
- doc? ( app-doc/doxygen )
- !gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-# app-accessibility/pidgin-festival
-# net-im/librvp
-# x11-plugins/guifications
-# x11-plugins/msn-pecan
-# x11-plugins/pidgin-encryption
-# x11-plugins/pidgin-extprefs
-# x11-plugins/pidgin-hotkeys
-# x11-plugins/pidgin-latex
-# x11-plugins/pidgintex
-# x11-plugins/pidgin-libnotify
-# x11-plugins/pidgin-mbpurple
-# x11-plugins/pidgin-bot-sentry
-# x11-plugins/pidgin-otr
-# x11-plugins/pidgin-rhythmbox
-# x11-plugins/purple-plugin_pack
-# x11-themes/pidgin-smileys
-# x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-# x11-plugins/pidgin-audacious-remote
-# x11-plugins/pidgin-autoanswer
-# x11-plugins/pidgin-birthday-reminder
-# x11-plugins/pidgin-blinklight
-# x11-plugins/pidgin-convreverse
-# x11-plugins/pidgin-embeddedvideo
-# x11-plugins/pidgin-extended-blist-sort
-# x11-plugins/pidgin-gfire
-# x11-plugins/pidgin-lastfm
-# x11-plugins/pidgin-sendscreenshot
-# x11-plugins/pidgimpd
-
-pkg_setup() {
- if ! use gtk && ! use ncurses ; then
- elog "You did not pick the ncurses or gtk use flags, only libpurple"
- elog "will be built."
- fi
- if use dbus || { use ncurses && use python; }; then
- python-single-r1_pkg_setup
- fi
-
- # dbus is enabled, no way to disable linkage with python => python is enabled
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
- if use gtk && ! use nls; then
- ewarn "gtk build => nls is enabled!"
- fi
- if use dbus && ! use python; then
- elog "dbus is enabled, no way to disable linkage with python => python is enabled"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
- "${FILESDIR}/${P}-fix-cap.patch" \
- "${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
- "${FILESDIR}/${PN}-eds-3.6.patch"
-
- epatch_user
- epatch "${FILESDIR}"/pidgin-gnome-keyring-2.patch
-
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- local myconf
-
- if use gadu; then
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
- fi
-
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use silc && DYNAMIC_PRPLS+=",silc"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use mxit && DYNAMIC_PRPLS+=",mxit"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
- if use gnutls; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
- fi
-
- if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
- else
- myconf+=" --without-python"
- fi
-
- econf \
- $(use_enable ncurses consoleui) \
- $(use_enable gtk gtkui) \
- $(use_enable gtk sm) \
- $(use gtk || use_enable nls) \
- $(use gtk && echo "--enable-nls") \
- $(use gtk && use_enable xscreensaver screensaver) \
- $(use gtk && use_enable prediction cap) \
- $(use gtk && use_enable eds gevolution) \
- $(use gtk && use_enable spell gtkspell) \
- $(use_enable perl) \
- $(use_enable tk) \
- $(use_enable tcl) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable meanwhile) \
- $(use_enable gstreamer) \
- $(use_enable gnome-keyring) \
- $(use_enable gstreamer farstream) \
- $(use_enable gstreamer vv) \
- $(use_enable sasl cyrus-sasl ) \
- $(use_enable doc doxygen) \
- $(use_enable networkmanager nm) \
- $(use_enable zeroconf avahi) \
- $(use_enable idn) \
- --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
- --disable-mono \
- --x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
- #$(use_enable mono) \
-}
-
-src_install() {
- gnome2_src_install
- if use gtk; then
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
- # implementations that are not complient with new hicolor theme yet, #323355
- local pixmapdir
- for d in 16 22 32 48; do
- pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
- mkdir "${pixmapdir}" || die
- pushd "${pixmapdir}" >/dev/null || die
- for f in ../status/*; do
- ln -s ${f} || die
- done
- popd >/dev/null
- done
- fi
- use perl && fixlocalpod
-
- dodoc finch/plugins/pietray.py
- docompress -x /usr/share/doc/${PF}/pietray.py
-
- prune_libtool_files --all
-}
diff --git a/net-im/pidgin/pidgin-2.10.7-r3.ebuild b/net-im/pidgin/pidgin-2.10.7-r3.ebuild
deleted file mode 100644
index d04c64b..0000000
--- a/net-im/pidgin/pidgin-2.10.7-r3.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r3.ebuild,v 1.1 2013/08/10 02:08:31 mattst88 Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-IUSE+=" gnome-keyring"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
- >=dev-libs/glib-2.16
- >=dev-libs/libxml2-2.6.18
- ncurses? ( sys-libs/ncurses[unicode]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} ) )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6 )
- prediction? ( >=dev-db/sqlite-3.3:3 ) )
- gstreamer? ( =media-libs/gstreamer-0.10*
- =media-libs/gst-plugins-good-0.10*
- || ( net-libs/farstream:0.1 net-libs/farsight2 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gconf:0.10 )
- zeroconf? ( net-dns/avahi[dbus] )
- dbus? ( >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90
- dev-python/dbus-python )
- perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
- 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 )
- silc? ( >=net-im/silc-toolkit-1.0.1 )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn )
- !<x11-plugins/pidgin-facebookchat-1.69-r1"
- # Mono support crashes pidgin
- #mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
- dev-lang/perl
- dev-perl/XML-Parser
- virtual/pkgconfig
- gtk? ( x11-proto/scrnsaverproto
- ${NLS_DEPEND} )
- dbus? ( ${PYTHON_DEPS} )
- doc? ( app-doc/doxygen )
- !gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-# app-accessibility/pidgin-festival
-# net-im/librvp
-# x11-plugins/guifications
-# x11-plugins/msn-pecan
-# x11-plugins/pidgin-encryption
-# x11-plugins/pidgin-extprefs
-# x11-plugins/pidgin-hotkeys
-# x11-plugins/pidgin-latex
-# x11-plugins/pidgintex
-# x11-plugins/pidgin-libnotify
-# x11-plugins/pidgin-mbpurple
-# x11-plugins/pidgin-bot-sentry
-# x11-plugins/pidgin-otr
-# x11-plugins/pidgin-rhythmbox
-# x11-plugins/purple-plugin_pack
-# x11-themes/pidgin-smileys
-# x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-# x11-plugins/pidgin-audacious-remote
-# x11-plugins/pidgin-autoanswer
-# x11-plugins/pidgin-birthday-reminder
-# x11-plugins/pidgin-blinklight
-# x11-plugins/pidgin-convreverse
-# x11-plugins/pidgin-embeddedvideo
-# x11-plugins/pidgin-extended-blist-sort
-# x11-plugins/pidgin-gfire
-# x11-plugins/pidgin-lastfm
-# x11-plugins/pidgin-sendscreenshot
-# x11-plugins/pidgimpd
-
-pkg_setup() {
- if ! use gtk && ! use ncurses ; then
- elog "You did not pick the ncurses or gtk use flags, only libpurple"
- elog "will be built."
- fi
- if use dbus || { use ncurses && use python; }; then
- python-single-r1_pkg_setup
- fi
-
- # dbus is enabled, no way to disable linkage with python => python is enabled
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
- if use gtk && ! use nls; then
- ewarn "gtk build => nls is enabled!"
- fi
- if use dbus && ! use python; then
- elog "dbus is enabled, no way to disable linkage with python => python is enabled"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
- "${FILESDIR}/${P}-fix-cap.patch" \
- "${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
- "${FILESDIR}/${PN}-eds-3.6.patch"
-
- epatch_user
- epatch "${FILESDIR}"/pidgin-gnome-keyring-2.patch
-
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- local myconf
-
- if use gadu; then
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
- fi
-
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use silc && DYNAMIC_PRPLS+=",silc"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use mxit && DYNAMIC_PRPLS+=",mxit"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
- if use gnutls; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
- fi
-
- if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
- else
- myconf+=" --without-python"
- fi
-
- econf \
- $(use_enable ncurses consoleui) \
- $(use_enable gtk gtkui) \
- $(use_enable gtk sm) \
- $(use gtk || use_enable nls) \
- $(use gtk && echo "--enable-nls") \
- $(use gtk && use_enable xscreensaver screensaver) \
- $(use gtk && use_enable prediction cap) \
- $(use gtk && use_enable eds gevolution) \
- $(use gtk && use_enable spell gtkspell) \
- $(use_enable perl) \
- $(use_enable tk) \
- $(use_enable tcl) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable meanwhile) \
- $(use_enable gstreamer) \
- $(use_enable gnome-keyring) \
- $(use_enable gstreamer farstream) \
- $(use_enable gstreamer vv) \
- $(use_enable sasl cyrus-sasl ) \
- $(use_enable doc doxygen) \
- $(use_enable networkmanager nm) \
- $(use_enable zeroconf avahi) \
- $(use_enable idn) \
- --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
- --disable-mono \
- --x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
- #$(use_enable mono) \
-}
-
-src_install() {
- gnome2_src_install
- if use gtk; then
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
- # implementations that are not complient with new hicolor theme yet, #323355
- local pixmapdir
- for d in 16 22 32 48; do
- pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
- mkdir "${pixmapdir}" || die
- pushd "${pixmapdir}" >/dev/null || die
- for f in ../status/*; do
- ln -s ${f} || die
- done
- popd >/dev/null
- done
- fi
- use perl && fixlocalpod
-
- dodoc finch/plugins/pietray.py
- docompress -x /usr/share/doc/${PF}/pietray.py
-
- prune_libtool_files --all
-}
diff --git a/net-im/pidgin/pidgin-2.10.7-r5.ebuild b/net-im/pidgin/pidgin-2.10.7-r5.ebuild
deleted file mode 100644
index e693432..0000000
--- a/net-im/pidgin/pidgin-2.10.7-r5.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.7-r5.ebuild,v 1.1 2013/08/14 05:45:02 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-IUSE+=" gnome-keyring"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
- >=dev-libs/glib-2.16
- >=dev-libs/libxml2-2.6.18
- ncurses? ( sys-libs/ncurses[unicode]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} ) )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6 )
- prediction? ( >=dev-db/sqlite-3.3:3 ) )
- gstreamer? ( =media-libs/gstreamer-0.10*
- =media-libs/gst-plugins-good-0.10*
- || ( net-libs/farstream:0.1 net-libs/farsight2 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gconf:0.10 )
- zeroconf? ( net-dns/avahi[dbus] )
- dbus? ( >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90
- dev-python/dbus-python )
- perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
- 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 )
- silc? ( >=net-im/silc-toolkit-1.0.1 )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn )
- !<x11-plugins/pidgin-facebookchat-1.69-r1"
- # Mono support crashes pidgin
- #mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
- dev-lang/perl
- dev-perl/XML-Parser
- virtual/pkgconfig
- gtk? ( x11-proto/scrnsaverproto
- ${NLS_DEPEND} )
- dbus? ( ${PYTHON_DEPS} )
- doc? ( app-doc/doxygen )
- !gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-# app-accessibility/pidgin-festival
-# net-im/librvp
-# x11-plugins/guifications
-# x11-plugins/msn-pecan
-# x11-plugins/pidgin-encryption
-# x11-plugins/pidgin-extprefs
-# x11-plugins/pidgin-hotkeys
-# x11-plugins/pidgin-latex
-# x11-plugins/pidgintex
-# x11-plugins/pidgin-libnotify
-# x11-plugins/pidgin-mbpurple
-# x11-plugins/pidgin-bot-sentry
-# x11-plugins/pidgin-otr
-# x11-plugins/pidgin-rhythmbox
-# x11-plugins/purple-plugin_pack
-# x11-themes/pidgin-smileys
-# x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-# x11-plugins/pidgin-audacious-remote
-# x11-plugins/pidgin-autoanswer
-# x11-plugins/pidgin-birthday-reminder
-# x11-plugins/pidgin-blinklight
-# x11-plugins/pidgin-convreverse
-# x11-plugins/pidgin-embeddedvideo
-# x11-plugins/pidgin-extended-blist-sort
-# x11-plugins/pidgin-gfire
-# x11-plugins/pidgin-lastfm
-# x11-plugins/pidgin-sendscreenshot
-# x11-plugins/pidgimpd
-
-pkg_setup() {
- if ! use gtk && ! use ncurses ; then
- elog "You did not pick the ncurses or gtk use flags, only libpurple"
- elog "will be built."
- fi
- if use dbus || { use ncurses && use python; }; then
- python-single-r1_pkg_setup
- fi
-
- # dbus is enabled, no way to disable linkage with python => python is enabled
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
- if use gtk && ! use nls; then
- ewarn "gtk build => nls is enabled!"
- fi
- if use dbus && ! use python; then
- elog "dbus is enabled, no way to disable linkage with python => python is enabled"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
- "${FILESDIR}/${P}-fix-cap.patch" \
- "${FILESDIR}/${P}-link_sasl_in_irc_plugin.patch" \
- "${FILESDIR}/${PN}-eds-3.6.patch"
-
- epatch_user
- epatch "${FILESDIR}"/pidgin-gnome-keyring-2.patch
-
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- local myconf
-
- if use gadu; then
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
- fi
-
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use silc && DYNAMIC_PRPLS+=",silc"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use mxit && DYNAMIC_PRPLS+=",mxit"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
- if use gnutls; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
- fi
-
- if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
- else
- myconf+=" --without-python"
- fi
-
- econf \
- $(use_enable ncurses consoleui) \
- $(use_enable gtk gtkui) \
- $(use_enable gtk sm) \
- $(use gtk || use_enable nls) \
- $(use gtk && echo "--enable-nls") \
- $(use gtk && use_enable xscreensaver screensaver) \
- $(use gtk && use_enable prediction cap) \
- $(use gtk && use_enable eds gevolution) \
- $(use gtk && use_enable spell gtkspell) \
- $(use_enable perl) \
- $(use_enable tk) \
- $(use_enable tcl) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable meanwhile) \
- $(use_enable gstreamer) \
- $(use_enable gnome-keyring) \
- $(use_enable gstreamer farstream) \
- $(use_enable gstreamer vv) \
- $(use_enable sasl cyrus-sasl ) \
- $(use_enable doc doxygen) \
- $(use_enable networkmanager nm) \
- $(use_enable zeroconf avahi) \
- $(use_enable idn) \
- --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
- --disable-mono \
- --x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
- #$(use_enable mono) \
-}
-
-src_install() {
- gnome2_src_install
- if use gtk; then
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
- # implementations that are not complient with new hicolor theme yet, #323355
- local pixmapdir
- for d in 16 22 32 48; do
- pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
- mkdir "${pixmapdir}" || die
- pushd "${pixmapdir}" >/dev/null || die
- for f in ../status/*; do
- ln -s ${f} || die
- done
- popd >/dev/null
- done
- fi
- use perl && fixlocalpod
-
- dodoc finch/plugins/pietray.py
- docompress -x /usr/share/doc/${PF}/pietray.py
-
- prune_libtool_files --all
-}
diff --git a/net-im/pidgin/pidgin-2.10.8-r1.ebuild b/net-im/pidgin/pidgin-2.10.8-r1.ebuild
deleted file mode 100644
index 8beea0b..0000000
--- a/net-im/pidgin/pidgin-2.10.8-r1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.8-r1.ebuild,v 1.1 2014/01/28 17:05:37 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-IUSE+=" gnome-keyring"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
- >=dev-libs/glib-2.16
- >=dev-libs/libxml2-2.6.18
- ncurses? ( sys-libs/ncurses[unicode]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} ) )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6 )
- prediction? ( >=dev-db/sqlite-3.3:3 ) )
- gstreamer? ( =media-libs/gstreamer-0.10*
- =media-libs/gst-plugins-good-0.10*
- || ( net-libs/farstream:0.1 net-libs/farsight2 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gconf:0.10 )
- zeroconf? ( net-dns/avahi[dbus] )
- dbus? ( >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90
- dev-python/dbus-python )
- perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
- 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 )
- silc? ( >=net-im/silc-toolkit-1.0.1 )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn )
- !<x11-plugins/pidgin-facebookchat-1.69-r1"
- # Mono support crashes pidgin
- #mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
- dev-lang/perl
- dev-perl/XML-Parser
- virtual/pkgconfig
- gtk? ( x11-proto/scrnsaverproto
- ${NLS_DEPEND} )
- dbus? ( ${PYTHON_DEPS} )
- doc? ( app-doc/doxygen )
- !gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-# app-accessibility/pidgin-festival
-# net-im/librvp
-# x11-plugins/guifications
-# x11-plugins/msn-pecan
-# x11-plugins/pidgin-encryption
-# x11-plugins/pidgin-extprefs
-# x11-plugins/pidgin-hotkeys
-# x11-plugins/pidgin-latex
-# x11-plugins/pidgintex
-# x11-plugins/pidgin-libnotify
-# x11-plugins/pidgin-mbpurple
-# x11-plugins/pidgin-bot-sentry
-# x11-plugins/pidgin-otr
-# x11-plugins/pidgin-rhythmbox
-# x11-plugins/purple-plugin_pack
-# x11-themes/pidgin-smileys
-# x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-# x11-plugins/pidgin-audacious-remote
-# x11-plugins/pidgin-autoanswer
-# x11-plugins/pidgin-birthday-reminder
-# x11-plugins/pidgin-blinklight
-# x11-plugins/pidgin-convreverse
-# x11-plugins/pidgin-embeddedvideo
-# x11-plugins/pidgin-extended-blist-sort
-# x11-plugins/pidgin-gfire
-# x11-plugins/pidgin-lastfm
-# x11-plugins/pidgin-sendscreenshot
-# x11-plugins/pidgimpd
-
-pkg_setup() {
- if ! use gtk && ! use ncurses ; then
- elog "You did not pick the ncurses or gtk use flags, only libpurple"
- elog "will be built."
- fi
- if use dbus || { use ncurses && use python; }; then
- python-single-r1_pkg_setup
- fi
-
- # dbus is enabled, no way to disable linkage with python => python is enabled
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
- if use gtk && ! use nls; then
- ewarn "gtk build => nls is enabled!"
- fi
- if use dbus && ! use python; then
- elog "dbus is enabled, no way to disable linkage with python => python is enabled"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
- "${WORKDIR}/${PN}-eds-3.6.patch"
-
- epatch_user
- epatch "${FILESDIR}"/pidgin-gnome-keyring-2.patch
-
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- local myconf
-
- if use gadu; then
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
- fi
-
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use silc && DYNAMIC_PRPLS+=",silc"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use mxit && DYNAMIC_PRPLS+=",mxit"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
- if use gnutls; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
- fi
-
- if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
- else
- myconf+=" --without-python"
- fi
-
- econf \
- $(use_enable ncurses consoleui) \
- $(use_enable gtk gtkui) \
- $(use_enable gtk sm) \
- $(use gtk || use_enable nls) \
- $(use gtk && echo "--enable-nls") \
- $(use gtk && use_enable xscreensaver screensaver) \
- $(use gtk && use_enable prediction cap) \
- $(use gtk && use_enable eds gevolution) \
- $(use gtk && use_enable spell gtkspell) \
- $(use_enable perl) \
- $(use_enable tk) \
- $(use_enable tcl) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable meanwhile) \
- $(use_enable gstreamer) \
- $(use_enable gnome-keyring) \
- $(use_enable gstreamer farstream) \
- $(use_enable gstreamer vv) \
- $(use_enable sasl cyrus-sasl ) \
- $(use_enable doc doxygen) \
- $(use_enable networkmanager nm) \
- $(use_enable zeroconf avahi) \
- $(use_enable idn) \
- --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
- --disable-mono \
- --x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
- #$(use_enable mono) \
-}
-
-src_install() {
- gnome2_src_install
- if use gtk; then
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
- # implementations that are not complient with new hicolor theme yet, #323355
- local pixmapdir
- for d in 16 22 32 48; do
- pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
- mkdir "${pixmapdir}" || die
- pushd "${pixmapdir}" >/dev/null || die
- for f in ../status/*; do
- ln -s ${f} || die
- done
- popd >/dev/null
- done
- fi
- use perl && fixlocalpod
-
- dodoc finch/plugins/pietray.py
- docompress -x /usr/share/doc/${PF}/pietray.py
-
- prune_libtool_files --all
-}
diff --git a/net-im/pidgin/pidgin-2.10.9-r1.ebuild b/net-im/pidgin/pidgin-2.10.9-r1.ebuild
deleted file mode 100644
index bdbc798..0000000
--- a/net-im/pidgin/pidgin-2.10.9-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.1 2014/02/03 13:37:08 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-IUSE+=" gnome-keyring"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
- >=dev-libs/glib-2.16
- >=dev-libs/libxml2-2.6.18
- ncurses? ( sys-libs/ncurses[unicode]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} ) )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6 )
- prediction? ( >=dev-db/sqlite-3.3:3 ) )
- gstreamer? ( =media-libs/gstreamer-0.10*
- =media-libs/gst-plugins-good-0.10*
- || ( net-libs/farstream:0.1 net-libs/farsight2 )
- media-plugins/gst-plugins-meta:0.10
- media-plugins/gst-plugins-gconf:0.10 )
- zeroconf? ( net-dns/avahi[dbus] )
- dbus? ( >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90
- dev-python/dbus-python )
- perl? ( || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] ) )
- 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.15.4 )
- meanwhile? ( net-libs/meanwhile )
- silc? ( >=net-im/silc-toolkit-1.0.1 )
- tcl? ( dev-lang/tcl )
- tk? ( dev-lang/tk )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn )
- !<x11-plugins/pidgin-facebookchat-1.69-r1"
- # Mono support crashes pidgin
- #mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
- dev-lang/perl
- dev-perl/XML-Parser
- virtual/pkgconfig
- gtk? ( x11-proto/scrnsaverproto
- ${NLS_DEPEND} )
- dbus? ( ${PYTHON_DEPS} )
- doc? ( app-doc/doxygen )
- !gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-# app-accessibility/pidgin-festival
-# net-im/librvp
-# x11-plugins/guifications
-# x11-plugins/msn-pecan
-# x11-plugins/pidgin-encryption
-# x11-plugins/pidgin-extprefs
-# x11-plugins/pidgin-hotkeys
-# x11-plugins/pidgin-latex
-# x11-plugins/pidgintex
-# x11-plugins/pidgin-libnotify
-# x11-plugins/pidgin-mbpurple
-# x11-plugins/pidgin-bot-sentry
-# x11-plugins/pidgin-otr
-# x11-plugins/pidgin-rhythmbox
-# x11-plugins/purple-plugin_pack
-# x11-themes/pidgin-smileys
-# x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-# x11-plugins/pidgin-audacious-remote
-# x11-plugins/pidgin-autoanswer
-# x11-plugins/pidgin-birthday-reminder
-# x11-plugins/pidgin-blinklight
-# x11-plugins/pidgin-convreverse
-# x11-plugins/pidgin-embeddedvideo
-# x11-plugins/pidgin-extended-blist-sort
-# x11-plugins/pidgin-gfire
-# x11-plugins/pidgin-lastfm
-# x11-plugins/pidgin-sendscreenshot
-# x11-plugins/pidgimpd
-
-pkg_setup() {
- if ! use gtk && ! use ncurses ; then
- elog "You did not pick the ncurses or gtk use flags, only libpurple"
- elog "will be built."
- fi
- if use dbus || { use ncurses && use python; }; then
- python-single-r1_pkg_setup
- fi
-
- # dbus is enabled, no way to disable linkage with python => python is enabled
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
- if use gtk && ! use nls; then
- ewarn "gtk build => nls is enabled!"
- fi
- if use dbus && ! use python; then
- elog "dbus is enabled, no way to disable linkage with python => python is enabled"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
- "${WORKDIR}/${PN}-eds-3.6.patch"
-
- epatch_user
- epatch "${FILESDIR}"/pidgin-gnome-keyring-2.patch
-
- eautoreconf
-}
-
-src_configure() {
- # Stabilize things, for your own good
- strip-flags
- replace-flags -O? -O2
-
- local myconf
-
- if use gadu; then
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
- myconf="${myconf} --with-gadu-includes=."
- myconf="${myconf} --with-gadu-libs=."
- fi
-
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use silc && DYNAMIC_PRPLS+=",silc"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use mxit && DYNAMIC_PRPLS+=",mxit"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
- if use gnutls; then
- einfo "Disabling NSS, using GnuTLS"
- myconf+=" --enable-nss=no --enable-gnutls=yes"
- myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
- myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
- else
- einfo "Disabling GnuTLS, using NSS"
- myconf+=" --enable-gnutls=no --enable-nss=yes"
- fi
-
- if use dbus || { use ncurses && use python; }; then
- myconf+=" --with-python=${PYTHON}"
- else
- myconf+=" --without-python"
- fi
-
- econf \
- $(use_enable ncurses consoleui) \
- $(use_enable gtk gtkui) \
- $(use_enable gtk sm) \
- $(use gtk || use_enable nls) \
- $(use gtk && echo "--enable-nls") \
- $(use gtk && use_enable xscreensaver screensaver) \
- $(use gtk && use_enable prediction cap) \
- $(use gtk && use_enable eds gevolution) \
- $(use gtk && use_enable spell gtkspell) \
- $(use_enable perl) \
- $(use_enable tk) \
- $(use_enable tcl) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable meanwhile) \
- $(use_enable gstreamer) \
- $(use_enable gnome-keyring) \
- $(use_enable gstreamer farstream) \
- $(use_enable gstreamer vv) \
- $(use_enable sasl cyrus-sasl ) \
- $(use_enable doc doxygen) \
- $(use_enable networkmanager nm) \
- $(use_enable zeroconf avahi) \
- $(use_enable idn) \
- --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
- --disable-mono \
- --x-includes="${EPREFIX}"/usr/include/X11 \
- ${myconf}
- #$(use_enable mono) \
-}
-
-src_install() {
- gnome2_src_install
- if use gtk; then
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
- # implementations that are not complient with new hicolor theme yet, #323355
- local pixmapdir
- for d in 16 22 32 48; do
- pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
- mkdir "${pixmapdir}" || die
- pushd "${pixmapdir}" >/dev/null || die
- for f in ../status/*; do
- ln -s ${f} || die
- done
- popd >/dev/null
- done
- fi
- use perl && fixlocalpod
-
- if use python || use dbus ; then
- python_fix_shebang "${D}"
- python_optimize
- fi
-
- dodoc finch/plugins/pietray.py
- docompress -x /usr/share/doc/${PF}/pietray.py
-
- prune_libtool_files --all
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/
@ 2016-02-29 3:50 Patrick McLean
0 siblings, 0 replies; 12+ messages in thread
From: Patrick McLean @ 2016-02-29 3:50 UTC (permalink / raw
To: gentoo-commits
commit: 9044ef902c30aa13feb716ca17b098af21f458ac
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 01:48:15 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 01:48:15 2016 +0000
URL: https://gitweb.gentoo.org/dev/chutzpah.git/commit/?id=9044ef90
net-im/pidgin: version bump to 2.10.12
net-im/pidgin/Manifest | 3 +
net-im/pidgin/files/pidgin-2.10.11-tinfo.patch | 24 +++
net-im/pidgin/pidgin-2.10.12.ebuild | 254 +++++++++++++++++++++++++
3 files changed, 281 insertions(+)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index c08150b..7941f7b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,7 @@ AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da6
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512 9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9 WHIRLPOOL d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 SHA256 548d459f17970d963147db19a2959b19da7d1f6c1958ae3ed3b609cf6be8b775 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0 WHIRLPOOL 55183fdb3057a79e367566196abfa368962202eca3f63676cb80d791e0c0baa9245d67733b88d6af523524ec9d0ed941fe284552fe1bdfd91daf1b33ca67ffed
+AUX pidgin-2.10.11-tinfo.patch 892 SHA256 f722ea593f2ec0d9061ca051519bbbb389f2056dbda4fd4e80df545af78a6a16 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db WHIRLPOOL b5a3a5bd8c3d8428aac1e2fe20ec740a03cd397a5b79db2c2df593ed5ace7217871b27ad33bae0ab034f7d229526afc2688617b8fca666de26937b1575cb1a02
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256 8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512 3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1 WHIRLPOOL 5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256 c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd WHIRLPOOL 3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
@@ -9,5 +10,7 @@ AUX pidgin-eds-3.6.patch 9895 SHA256 f7dcb08b14cbb2320a01afb59a815f8e11890cf9c41
AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
AUX pidgin-gnome-keyring-3.patch 8966 SHA256 4cf873682a4e2d7218f14f498a3c38d982b46175ef57fb8022b607528d2d844e SHA512 5786a0baa9d874fda882a7d9955e0b2c4234fef3db3957130c4b9ebc580412a6217fbb8da538c1451d7d34c3ce1d404eaa4037486e72e091c2bcc22c97bda30f WHIRLPOOL 72c23432a50837d78c9d7dceafe9a069a871e50750f4f7d194bb1818bc0aca99d9634c0c1d5c90a33cb375d48c837781f679b256de169de7018594b492108b80
DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
+DIST pidgin-2.10.12.tar.bz2 9837598 SHA256 2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd SHA512 4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03 WHIRLPOOL 52f16cdd76b1aa3e76a877136070e3c4875827df621757d35656eb79e7d9921635f9373d33f9bc87275200e91c25a2763b4a64d90953322fd82d03860ce6a0da
DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
EBUILD pidgin-2.10.11.ebuild 7541 SHA256 22226232e8f1c941cdf6769529cf11a137b31a25da87ac2e7ca7b38fe88563f3 SHA512 5f35cefb5012c73b0974ef019d1af56042cce35ab17f49e503bf00ac0b72c7a2869d28e837d1e5b3bda1984c511161de1bdc5c1f445f2db841ac40e5e07197e5 WHIRLPOOL 9c02539c1c0e8bec3ea0ee76c214dcf446976aaa58ff6b14452acf68cd906683fb9cce9525e080976603fa09639b2dca6adea133ea8bacd91cd27359b8307b93
+EBUILD pidgin-2.10.12.ebuild 7509 SHA256 7d6e936c8d33d367bac9f6d162cb35c8262ce34083c77dbda8abb9db53ad5778 SHA512 fe2fdd298f03a529a4c8864d9593055653553812f3f037f4e750521ef0cc39d72edb25dd9a50bb8fc9d2271dbccb33b342f30edcf119227657fee450f62a14ea WHIRLPOOL c61e6a9a41434a29b8dddb1f6fc5471901b8e1997e720ac31f53c7066aaf9f2855daa59f5850c2132fbd935dfc72dfd408a8bb0568f00bb5e13379749cc68089
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
new file mode 100644
index 0000000..370ac62
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
@@ -0,0 +1,24 @@
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 51471b1..81c57ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
+ [compile finch against the ncurses includes in DIR])],
+ [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
+ if test "x$enable_consoleui" = "xyes"; then
++ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
++ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
+ AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
+ AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
+ [enable_consoleui=no], [$GNT_LIBS])
+@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
+ fi
+ fi
+ fi
++ ])])
+ fi
+
+ if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/pidgin-2.10.12.ebuild b/net-im/pidgin/pidgin-2.10.12.ebuild
new file mode 100644
index 0000000..ffa3823
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.12.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+IUSE+=" gnome-keyring"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses:0=[unicode]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=net-libs/farstream-0.2.7:0.2 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=sys-apps/dbus-0.90
+ dev-python/dbus-python )
+ perl? ( >=dev-lang/perl-5.16:= )
+ gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ virtual/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( ${PYTHON_DEPS} )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ dbus? ( ${PYTHON_REQUIRED_USE} )"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use python || use dbus ; then
+ python-single-r1_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.10.0-gold.patch \
+ "${WORKDIR}"/${PN}-eds-3.6.patch \
+ "${FILESDIR}"/${PN}-2.10.9-fix-gtkmedia.patch \
+ "${FILESDIR}"/${PN}-2.10.10-eds-3.6-configure.ac.patch \
+ "${FILESDIR}"/${PN}-2.10.11-tinfo.patch
+ epatch_user
+ epatch "${FILESDIR}/pidgin-gnome-keyring-3.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use mxit && DYNAMIC_PRPLS+=",mxit"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=${PYTHON}"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_with gstreamer gstreamer 1.0) \
+ $(use_enable gnome-keyring) \
+ $(use_enable gstreamer farstream) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes="${EPREFIX}"/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && perl_delete_localpod
+
+ if use python || use dbus ; then
+ python_fix_shebang "${D}"
+ python_optimize
+ fi
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ prune_libtool_files --all
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-02-29 3:50 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-12 21:51 [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/, net-im/pidgin/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2016-02-29 3:50 Patrick McLean
2014-11-26 18:27 Patrick McLean
2013-06-20 23:46 Patrick McLean
2013-03-23 1:29 Patrick McLean
2013-03-11 18:05 Patrick McLean
2011-10-28 1:16 Patrick McLean
2011-10-03 6:48 Patrick McLean
2011-08-23 18:12 Patrick McLean
2011-06-27 16:28 Patrick McLean
2011-06-20 14:52 Patrick McLean
2011-06-19 13:57 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox