diff options
author | 2010-10-26 13:13:09 +0530 | |
---|---|---|
committer | 2010-10-26 13:13:09 +0530 | |
commit | f3bc8fe99c697223b3b69eced3f305812b550875 (patch) | |
tree | 3dffe9f444e4dedbee3ce258c8405bfc6dade456 | |
parent | penumbra-overture-bin: misc QA fixes. (diff) | |
download | nirbheek-f3bc8fe99c697223b3b69eced3f305812b550875.tar.gz nirbheek-f3bc8fe99c697223b3b69eced3f305812b550875.tar.bz2 nirbheek-f3bc8fe99c697223b3b69eced3f305812b550875.zip |
net-im/pidgin: bump to 2.7.4 (sync with portage)
-rw-r--r-- | net-im/pidgin/Manifest | 4 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.7.2-ldflags.patch | 25 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.7.3-ldflags.patch | 24 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.7.4.ebuild | 219 |
4 files changed, 246 insertions, 26 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 1a99ef1..a4ebcc7 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,4 +1,6 @@ -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-gnome-keyring.patch 6229 RMD160 2574e923fa09dd45996933854a9dd5644c8b0db3 SHA1 541e5062f6041d8e772ee02df3da90eb58ba4758 SHA256 d70ce355858a72bf35d94e20acc3c67a90a46c7f82eae3a9488ac39d9e9681d8 DIST pidgin-2.7.3.tar.bz2 9746117 RMD160 276fb19abf6505f9d56120c7412987002511fcb3 SHA1 81b9b5591ddbdf36aa656ddd90ff935ae090e940 SHA256 8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2 +DIST pidgin-2.7.4.tar.bz2 9799804 RMD160 900cdcffa34bfc43da803abf5427fdde8bb00b4e SHA1 f7d8d0fcecddda636db642e403280e85b76ea5f2 SHA256 7c6fa2811082bde2dbd0897414f9f8f18e7c3e51159288571af1f1f2ce81f856 EBUILD pidgin-2.7.3.ebuild 6237 RMD160 c37459bdccc3a3f0aeb63284a5254cffb4d094e6 SHA1 0f4d80ea52a74b14e0f24ef58fca8bca6bfc51e8 SHA256 d269c3d5f26b43e749bb708912a1043bab1ebe2702e750507cd75b11633150b7 +EBUILD pidgin-2.7.4.ebuild 6579 RMD160 7a23c5f5323782e5da296f87891675ad66c97e80 SHA1 2214df9432206c0f00f0ab57976b07c8e0793e6e SHA256 0b871832b29b186a53e2f9c2b7a85b6cd60f0e0643d9152a92fc6ac73a566b86 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 1a4cd7a..0000000 --- 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 <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 -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 <http://pidgin.im/>') : ()), -- '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 new file mode 100644 index 0000000..145858b --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.7.3-ldflags.patch @@ -0,0 +1,24 @@ +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/pidgin-2.7.4.ebuild b/net-im/pidgin/pidgin-2.7.4.ebuild new file mode 100644 index 0000000..47dfad0 --- /dev/null +++ b/net-im/pidgin/pidgin-2.7.4.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.4.ebuild,v 1.3 2010/10/25 16:22:46 mr_bones_ Exp $ + +EAPI=2 + +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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="dbus debug doc eds gadu gnutls gnome-keyring +gstreamer +gtk idn meanwhile" +IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification" +IUSE+=" ncurses 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. +RDEPEND=" + >=dev-libs/glib-2.12 + >=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 ) + startup-notification? ( >=x11-libs/startup-notification-0.5 ) + spell? ( >=app-text/gtkspell-2.0.2 ) + eds? ( gnome-extra/evolution-data-server ) + prediction? ( >=dev-db/sqlite-3.3:3 ) ) + gnome-keyring? ( gnome-base/gnome-keyring ) + 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 ) + perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) + gadu? ( >=net-libs/libgadu-1.9.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 )" + # 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-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-botsentry +# 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 gtk && ! use nls; then + ewarn "gtk build => nls is enalbed!" + 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_prepare() { + gnome2_src_prepare + epatch "${FILESDIR}"/${PN}-gnome-keyring.patch + epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.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 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 startup-notification) \ + $(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 gnome-keyring) \ + $(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" +} |