diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-08-05 23:53:23 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-05 23:53:23 +0000 |
commit | 619d81f4189f6201fd6346f4e85cea0a26f9f1d8 (patch) | |
tree | 880ced7df05cf62094d2f3091e2bb9f9deb4246e /net-im/pidgin | |
parent | Version bump; improve ebuild to not build tests; add USE flags for debug, min... (diff) | |
download | historical-619d81f4189f6201fd6346f4e85cea0a26f9f1d8.tar.gz historical-619d81f4189f6201fd6346f4e85cea0a26f9f1d8.tar.bz2 historical-619d81f4189f6201fd6346f4e85cea0a26f9f1d8.zip |
Respect LDFLAGS wrt bug #329557
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-im/pidgin')
-rw-r--r-- | net-im/pidgin/ChangeLog | 8 | ||||
-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/pidgin-2.7.2-r1.ebuild | 208 |
4 files changed, 243 insertions, 2 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index 3e83f4618aa5..2bd0a0e6ca10 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.183 2010/08/05 16:15:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.184 2010/08/05 23:53:22 hwoarang Exp $ + +*pidgin-2.7.2-r1 (05 Aug 2010) + + 05 Aug 2010; Markos Chandras <hwoarang@gentoo.org> + +pidgin-2.7.2-r1.ebuild, +files/pidgin-2.7.2-ldflags.patch: + Respect LDFLAGS wrt bug #329557 05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> pidgin-2.7.1-r1.ebuild, pidgin-2.7.2.ebuild: diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index d254745cdc2f..0649ac760718 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,7 +1,9 @@ AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e +AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1 DIST pidgin-2.7.2.tar.bz2 9681708 RMD160 c277e26f5fe91425033cb8fe6c8913d965dffec0 SHA1 03232f7befcfbe1c457d50d697493924fe5f9b49 SHA256 8ab5f126f384197727db8f61306663325c2779c25e54e61ff95366448a0861c0 EBUILD pidgin-2.7.1-r1.ebuild 5963 RMD160 39723d94d3eee63e2fb626a61925ec05e8092d90 SHA1 dfa1d302e8e97735caeacaa80c0e445e3c2e2403 SHA256 c1a894845aaaf1b837eeae1c581a149163a0bd57079e76edbdb95eeca178c92a +EBUILD pidgin-2.7.2-r1.ebuild 6073 RMD160 2996832d5fe0d3b98bf9233eb9234304f595ae90 SHA1 2097c068d2b679a21edbb64aee6bb9769128da50 SHA256 0165a0de1af704b355e69d9112655b04c42f591ba1a5846bcdfb18bea5ea839a EBUILD pidgin-2.7.2.ebuild 5961 RMD160 72f02548217805858c12ffce00989799454e34cc SHA1 dc08dcfdfa7e4e18934585bf454a8820f1d8ec11 SHA256 10b63f3ab4aa2b256f146b0164493f15806e68896ee0469da1bcd7ad6eaeb34e -MISC ChangeLog 25510 RMD160 b5f514893db76555375ac2f8c211909bb038a5fc SHA1 7c9fde8eee46635dcf5e67c783fe0181ae384306 SHA256 1f4cfc927bccf03cde84898373e638afdaf6aa4c9e18d5ea6f301f18006f9c38 +MISC ChangeLog 25691 RMD160 cbcbae375ff82b7e0689fa2ee14058187c7d65e6 SHA1 60ebf2e17b87f37a9e7b6d4f1deb4fab8e04c7bb SHA256 393fa27ae524a7907d14d3ac054dde46f449853b183d6bb59513b38c93f0706d MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba diff --git a/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch b/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch new file mode 100644 index 000000000000..1a4cd7ad5313 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.7.2-ldflags.patch @@ -0,0 +1,25 @@ +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/pidgin-2.7.2-r1.ebuild b/net-im/pidgin/pidgin-2.7.2-r1.ebuild new file mode 100644 index 000000000000..67f6a27da913 --- /dev/null +++ b/net-im/pidgin/pidgin-2.7.2-r1.ebuild @@ -0,0 +1,208 @@ +# 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.2-r1.ebuild,v 1.1 2010/08/05 23:53:22 hwoarang 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 +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 ) ) + 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 )" + +DEPEND="$RDEPEND + dev-lang/perl + dev-perl/XML-Parser + dev-util/pkgconfig + gtk? ( x11-proto/scrnsaverproto ) + dbus? ( <dev-lang/python-3 ) + doc? ( app-doc/doxygen ) + nls? ( >=dev-util/intltool-0.41.1 + sys-devel/gettext )" + +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 + einfo + elog "You did not pick the ncurses or gtk use flags, only libpurple" + elog "will be built." + einfo + fi + if use dbus && ! use python; then + elog "It's impossible to disable linkage with python in case dbus 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}"/${P}-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 \ + $(use_enable ncurses consoleui) \ + $(use_enable nls) \ + $(use_enable gtk gtkui) \ + $(use_enable gtk sm) \ + $(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 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-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 +} |