From 81741e2751d6ec403d6b53cb018c5e6dfdfed256 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sun, 2 Oct 2011 18:13:17 +0000 Subject: Fix heap-based buffer overflow, bug #385073 thank Sean Amoss for report. Drop old. Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- net-im/pidgin/ChangeLog | 14 +- net-im/pidgin/Manifest | 26 +-- .../files/pidgin-2.10.0-utf8-validation.patch | 27 +++ net-im/pidgin/files/pidgin-2.7.2-ldflags.patch | 25 --- net-im/pidgin/files/pidgin-2.7.3-ldflags.patch | 24 --- net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch | 13 -- .../pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 -- net-im/pidgin/metadata.xml | 1 - net-im/pidgin/pidgin-2.10.0-r1.ebuild | 219 ++++++++++++++++++++ net-im/pidgin/pidgin-2.7.11.ebuild | 213 -------------------- net-im/pidgin/pidgin-2.8.0-r1.ebuild | 222 --------------------- net-im/pidgin/pidgin-2.8.0.ebuild | 220 -------------------- net-im/pidgin/pidgin-2.9.0-r1.ebuild | 219 -------------------- net-im/pidgin/pidgin-2.9.0.ebuild | 215 -------------------- 14 files changed, 267 insertions(+), 1188 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch delete mode 100644 net-im/pidgin/files/pidgin-2.7.2-ldflags.patch delete mode 100644 net-im/pidgin/files/pidgin-2.7.3-ldflags.patch delete mode 100644 net-im/pidgin/files/pidgin-2.8.0-finch-icq.patch delete mode 100644 net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch create mode 100644 net-im/pidgin/pidgin-2.10.0-r1.ebuild delete mode 100644 net-im/pidgin/pidgin-2.7.11.ebuild delete mode 100644 net-im/pidgin/pidgin-2.8.0-r1.ebuild delete mode 100644 net-im/pidgin/pidgin-2.8.0.ebuild delete mode 100644 net-im/pidgin/pidgin-2.9.0-r1.ebuild delete mode 100644 net-im/pidgin/pidgin-2.9.0.ebuild (limited to 'net-im/pidgin') diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index 886e2e69cddf..c93a48f2d3a2 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.252 2011/08/27 11:26:18 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.253 2011/10/02 18:13:16 pva Exp $ + +*pidgin-2.10.0-r1 (02 Oct 2011) + + 02 Oct 2011; Peter Volkov -files/pidgin-2.7.2-ldflags.patch, + -files/pidgin-2.7.3-ldflags.patch, -pidgin-2.7.11.ebuild, + -pidgin-2.8.0.ebuild, -pidgin-2.8.0-r1.ebuild, + -files/pidgin-2.8.0-finch-icq.patch, -pidgin-2.9.0.ebuild, + -pidgin-2.9.0-r1.ebuild, -files/pidgin-2.9.0-conversation.c.patch, + +pidgin-2.10.0-r1.ebuild, +files/pidgin-2.10.0-utf8-validation.patch, + metadata.xml: + Fix heap-based buffer overflow, bug #385073 thank Sean Amoss for report. Drop + old. 27 Aug 2011; Raúl Porcel pidgin-2.10.0.ebuild: alpha/ia64/sparc stable wrt #380207 diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index ac149fc5e58b..f433b2d97602 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,26 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44 -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-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f +AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd -DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b -DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78 -DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7 +EBUILD pidgin-2.10.0-r1.ebuild 6637 RMD160 fb6f952ca7488f313eb10e52447436ab138a643a SHA1 f114fae9378ff8c55be4ef48423afb189dd89625 SHA256 8a8fb26fbd27581c4dc1fa40ee05e0f87b5f51d798a7648e280159a6a759adfd EBUILD pidgin-2.10.0.ebuild 6562 RMD160 315417db0c83cf819855ed8a84208896e8fa9ca3 SHA1 00e92fd46abaad91ff477425dd34cdff690cd6ab SHA256 fb96ec891ddbccf26adb2ac8db78e1e3a3bb97decb1adecba9faddfe48a9a05c -EBUILD pidgin-2.7.11.ebuild 6450 RMD160 15df33bfd9e0a4875a1206fe43cd54843104df69 SHA1 936ed58367c33e4df403d7764ecb7d51d2d6b9b6 SHA256 804438aedd0fd8b309c7291b60978b5cbad4acdc8c65e9fcf23722b978a4fa08 -EBUILD pidgin-2.8.0-r1.ebuild 6922 RMD160 d8ef43aa08c040fef51a39ec480a686a11c73f1b SHA1 590acac68022bf4f7a9617b03a1eb658414f8f78 SHA256 4e794fe3fdb55ecb1236a9c64acd592f313cb2bb6af34605ff1b4c74580d09e9 -EBUILD pidgin-2.8.0.ebuild 6835 RMD160 10c655434d6590a442b4cabfa9e0847c76fedfac SHA1 85783e1161b006f05d5bcf18a01053c5259e109f SHA256 6db41d97437a296141ae1234bd50d73e9808d28984f11d49d812eecbae5c38b9 -EBUILD pidgin-2.9.0-r1.ebuild 6643 RMD160 e92eaa5eb4adee2407fd95be576460b717d0eea5 SHA1 24ed54beb85844f03842d0b862e627b93e0c7e3b SHA256 849083f40ff6feb0f52e2e4066b576e13a5d2bf0a8381138dc2b9ac387a081c6 -EBUILD pidgin-2.9.0.ebuild 6564 RMD160 6ad35cd8e0e57fc926f717b9acdc0e204b1fec75 SHA1 74e25e6ed11be085dbdcd5712166d9bd4dfbc51f SHA256 07136384254a9cec2a3f98813265f4c85bbd4a05eabde343e6ffa31978f4de13 -MISC ChangeLog 35390 RMD160 583ecce1d9802c489b3734bba48c62f91cb089d8 SHA1 43e35b6098245f943777774a54b4ec7a90a29e1e SHA256 b68dea11b3608d446d4ad0103f1a96d7b3b92188a2afd236a8cc079d7ac7dbd5 -MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba +MISC ChangeLog 35914 RMD160 382526a0c5e4323621e579e2bc85bdd43ff16307 SHA1 a23b2bf87a41903ee4b187d4f62ff65fc05162ab SHA256 0521a188a6af90c570cba5053a326dda0a6f934ee78778932f33737c6f0c5d5d +MISC metadata.xml 1296 RMD160 d6ab4c09d3afc6a8a25a73f53aa784d9f53eacb0 SHA1 86cb3766fb6a8e87e749775c8a2f2e47a78cdb79 SHA256 21de4b3da6adef1ed3666a435937e637250a5699b8061cae28bcae4fc52f71c0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5Y1GAACgkQuQc30/atMkDDBQCgnMDpUclrVArD2L0/HGrVCJeW -ks0An2fShwDtrwJ3pj52DrylEPfRDttZ -=hVMA +iF4EAREIAAYFAk6IqWIACgkQGrk+8vGYmwfPkAEA4Ay4bXxcwykhbnOp9X3WVQxU +JmTn7VXNfVt4DSsOs1UA/0noiYQ1TNFVenpVLT6Y8kknv4M/66UzuFqH50SJTZcr +=OU8x -----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 000000000000..26ee17887bfb --- /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.7.2-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch deleted file mode 100644 index 1a4cd7ad5313..000000000000 --- a/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: pidgin-2.7.2/libpurple/plugins/perl/common/Makefile.PL.in -=================================================================== ---- pidgin-2.7.2.orig/libpurple/plugins/perl/common/Makefile.PL.in -+++ pidgin-2.7.2/libpurple/plugins/perl/common/Makefile.PL.in -@@ -10,6 +10,7 @@ WriteMakefile( - (ABSTRACT_FROM => '@srcdir@/Purple.pm', # finds $ABSTRACT - AUTHOR => 'Purple ') : ()), - '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 -Index: pidgin-2.7.2/pidgin/plugins/perl/common/Makefile.PL.in -=================================================================== ---- pidgin-2.7.2.orig/pidgin/plugins/perl/common/Makefile.PL.in -+++ pidgin-2.7.2/pidgin/plugins/perl/common/Makefile.PL.in -@@ -8,7 +8,7 @@ WriteMakefile( - ($] >= 5.005 ? ## Add these new keywords supported since 5.005 - ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT - 'AUTHOR' => 'Pidgin ') : ()), -- 'DEFINE' => '@DEBUG_CFLAGS@', -+ 'DEFINE' => '@DEBUG_CFLAGS@ @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.7.3-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch deleted file mode 100644 index 145858b187ba..000000000000 --- 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 ') : ()), - '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 ') : ()), - '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 deleted file mode 100644 index 18343f758831..000000000000 --- 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/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 bf09668913d5..000000000000 --- 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/metadata.xml b/net-im/pidgin/metadata.xml index 75dbcf61b2c3..788e9617fa4a 100644 --- a/net-im/pidgin/metadata.xml +++ b/net-im/pidgin/metadata.xml @@ -14,7 +14,6 @@ Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes Build finch, console interface Enable Contact Availability Prediction plugin Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support - Enable QQ protocol support Enable SILC protocol support Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events Enable Zephyr protocol support diff --git a/net-im/pidgin/pidgin-2.10.0-r1.ebuild b/net-im/pidgin/pidgin-2.10.0-r1.ebuild new file mode 100644 index 000000000000..0ea3df8d56a9 --- /dev/null +++ b/net-im/pidgin/pidgin-2.10.0-r1.ebuild @@ -0,0 +1,219 @@ +# 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-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 + +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" + +# 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? ( =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 ) + idn? ( net-dns/libidn ) + ! 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" +} + +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 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" +} diff --git a/net-im/pidgin/pidgin-2.7.11.ebuild b/net-im/pidgin/pidgin-2.7.11.ebuild deleted file mode 100644 index 3d3e5e0366be..000000000000 --- a/net-im/pidgin/pidgin-2.7.11.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# 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.7.11.ebuild,v 1.9 2011/04/15 08:01:55 pva Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python - -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 qq sasl ncurses" -IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" - -# 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.12 - >=dev-libs/libxml2-2.6.18 - ncurses? ( sys-libs/ncurses[unicode] - dbus? ( =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? ( >=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.10.1[ssl,gnutls] - net-libs/libgadu[-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 ) - ! 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 - if use dbus || { use ncurses && use python; }; then - python_set_active_version 2 - python_pkg_setup - fi -} - -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 qq && DYNAMIC_PRPLS+=",qq" - 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 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 "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" -} diff --git a/net-im/pidgin/pidgin-2.8.0-r1.ebuild b/net-im/pidgin/pidgin-2.8.0-r1.ebuild deleted file mode 100644 index 88aba45efe05..000000000000 --- a/net-im/pidgin/pidgin-2.8.0-r1.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# 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-r1.ebuild,v 1.2 2011/06/20 05:34:06 pva Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python - -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" - -# 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? ( =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? ( >=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 ) - ! 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() { - # Fix build issue. - # http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin/plugins/gevolution/gevolution.c - sed 's:\:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gevolution/gevolution.c || die - epatch "${FILESDIR}/${P}-finch-icq.patch" -} - -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 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" -} diff --git a/net-im/pidgin/pidgin-2.8.0.ebuild b/net-im/pidgin/pidgin-2.8.0.ebuild deleted file mode 100644 index bf964620fde1..000000000000 --- a/net-im/pidgin/pidgin-2.8.0.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# 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 $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python - -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" - -# 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? ( =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? ( >=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] ) - 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 ) - ! 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() { - # Fix build issue. - # http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin/plugins/gevolution/gevolution.c - sed 's:\:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gevolution/gevolution.c || die -} - -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 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" -} diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.9.0-r1.ebuild deleted file mode 100644 index 54bb7098942e..000000000000 --- a/net-im/pidgin/pidgin-2.9.0-r1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# 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 - -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" - -# 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? ( =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 ) - idn? ( net-dns/libidn ) - ! 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" -} - -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 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" -} diff --git a/net-im/pidgin/pidgin-2.9.0.ebuild b/net-im/pidgin/pidgin-2.9.0.ebuild deleted file mode 100644 index de1bc1981df3..000000000000 --- a/net-im/pidgin/pidgin-2.9.0.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# 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.ebuild,v 1.8 2011/07/09 16:49:54 xarthisius Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python - -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" - -# 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? ( =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 ) - idn? ( net-dns/libidn ) - ! 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_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 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" -} -- cgit v1.2.3-65-gdbad