Major cleanup
This commit is contained in:
layman
File diff suppressed because it is too large
Load Diff
@@ -1,6 +0,0 @@
|
||||
AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
|
||||
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
|
||||
DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
|
||||
EBUILD pidgin-2.10.7.ebuild 7126 SHA256 a6c585eb63e0c0a2c7691a620bc53b5612206cc0e1f29136b550e21f4f9f69b5 SHA512 9ce7916bcc1e805bf81c8b416a660c07412c626e3f936f06bae4745ad91d7e4aa14a159ae8ef0fb8f123c89b773a3eb8fc559bcf45cd3a463672765696821896 WHIRLPOOL da4e24bdb0a7333ae40bfc734b0419f6e1a1d6a64f1890512bd4e81b129dfe18c455244646e3620ab188405ceef1b53305be7cf26622f226c9ea29b0121ab31b
|
||||
MISC ChangeLog 41608 SHA256 a8e2c587ae2c5945407c69b525c9a29e38351a00ca421c636728e22ad1a2cd24 SHA512 f0dee23349a05fa4bd0e8d05b766464a52507c63a9634ffdbbc8cb4b26832995b57cc5b92d012f6a265218291e836fe8f126d8c98f9c54fad0d69380e4bddfab WHIRLPOOL 5c80371afd77d2e05c545ccff485c98c5ff614cb6d7d541655a504dc76183f8225ac1b2e68efb20b49ca386727210ba9c89e5c749641281b66130b17d47209be
|
||||
MISC metadata.xml 1311 SHA256 a0253264c64bdd1a4623db7f223cae50450dc8577d74748c25974ca909b80875 SHA512 18570fcf43047336441fd79d0581f6d7010192358a5dfe1d88d29ae33780c44fbc55d26d2c6088f615a87fa4131d729945cb0789941e8470948fc01b3f3f61f1 WHIRLPOOL a716b9e0682c6a56361e2bd6d788eaa8ce35a59aa701b1338a29bb2e34af1be9f579c52ff7698bedd888f7461a32a5abd59bddd95cc58d4633e20e3a394c478e
|
||||
@@ -1,30 +0,0 @@
|
||||
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 = \
|
||||
@@ -1,21 +0,0 @@
|
||||
|
||||
# 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;
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>net-im</herd>
|
||||
<longdescription>
|
||||
Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="gadu">Enable Gadu Gadu protocol support</flag>
|
||||
<flag name="groupwise">Enable Novell Groupwise protocol support</flag>
|
||||
<flag name="gstreamer">Enables voice and video sessions</flag>
|
||||
<flag name="gtk">Builds Pidgin, the GTK+ interface</flag>
|
||||
<flag name="meanwhile">Enable meanwhile support for Sametime protocol</flag>
|
||||
<flag name="ncurses">Build finch, console interface</flag>
|
||||
<flag name="prediction">Enable Contact Availability Prediction plugin</flag>
|
||||
<flag name="python">Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</flag>
|
||||
<flag name="silc">Enable SILC protocol support</flag>
|
||||
<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
|
||||
<flag name="zephyr">Enable Zephyr protocol support</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@@ -1,232 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.6.ebuild,v 1.9 2012/12/08 01:25:35 tetromino Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
|
||||
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+=" aqua"
|
||||
|
||||
# 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[aqua=]
|
||||
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/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? ( <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.7-fix-cap.patch"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
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=${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 \
|
||||
--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 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
|
||||
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
Reference in New Issue
Block a user