summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2011-02-26 03:00:12 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2011-02-26 03:00:12 +0530
commit4f8cc5ff62a8d6803fad941672f75280519ad2c6 (patch)
tree4d30059b41fc6b64ebfeb2ffbcaed1056da8f070
parentsys-power/upower: bump to 0.9.8 (diff)
downloadnirbheek-4f8cc5ff62a8d6803fad941672f75280519ad2c6.tar.gz
nirbheek-4f8cc5ff62a8d6803fad941672f75280519ad2c6.tar.bz2
nirbheek-4f8cc5ff62a8d6803fad941672f75280519ad2c6.zip
Bump pidgin
-rw-r--r--net-im/pidgin/Manifest5
-rw-r--r--net-im/pidgin/files/pidgin-2.7.3-ldflags.patch24
-rw-r--r--net-im/pidgin/pidgin-2.7.10.ebuild (renamed from net-im/pidgin/pidgin-2.7.9.ebuild)8
3 files changed, 7 insertions, 30 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7bc9b05..05e2f2d 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,3 @@
-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.9.tar.bz2 9965575 RMD160 4e913f608fa4ad3da81c4872c7202f567dfa4b95 SHA1 9fb36d788a644528ca1132befa553a3cb4228012 SHA256 9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e
-EBUILD pidgin-2.7.9.ebuild 6618 RMD160 cca6f8b5e8fa811c96b380e5b48977b2dddbd528 SHA1 1c84ac30decfb211b1b87c5da922f5ea0db65df3 SHA256 b9e248e9252a68b6f7ab8dfb0f2d2470ea7ac980d2bfb7b6e287b4834932ec89
+DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e
+EBUILD pidgin-2.7.10.ebuild 6748 RMD160 eab3fd4596523348e4b199a54eb8487eb9e00f36 SHA1 ebc020486df279eae43429370552c8a118c669e2 SHA256 1cd3e3c4d0dad9e67627fa44e8a57e8ed1e1854fade483f2fceaf09e9175238f
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/pidgin-2.7.9.ebuild b/net-im/pidgin/pidgin-2.7.10.ebuild
index e8fa0b0..0151682 100644
--- a/net-im/pidgin/pidgin-2.7.9.ebuild
+++ b/net-im/pidgin/pidgin-2.7.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
IUSE="dbus debug doc eds gadu gnome-keyring gnutls +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"
@@ -22,6 +22,8 @@ IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mon
# 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
@@ -44,7 +46,8 @@ RDEPEND="
media-plugins/gst-plugins-gconf )
zeroconf? ( net-dns/avahi )
dbus? ( >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-0.90 )
+ >=sys-apps/dbus-0.90
+ dev-python/dbus-python )
perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
gadu? ( >=net-libs/libgadu-1.9.0[-ssl] )
gnutls? ( net-libs/gnutls )
@@ -123,7 +126,6 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
epatch "${FILESDIR}"/${PN}-gnome-keyring.patch
- epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch
eautoreconf
}