Fix for linking with gold, #386079

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

4 files changed, 279 insertions, 16 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index afe242e1d74b..f94a242076ea 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.260 2011/10/27 04:56:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.261 2011/10/27 08:28:21 jlec Exp $
+
+*pidgin-2.10.0-r2 (27 Oct 2011)
+
+  27 Oct 2011; Justin Lecher <jlec@gentoo.org> +pidgin-2.10.0-r2.ebuild,
+  +files/pidgin-2.10.0-gold.patch, metadata.xml:
+  Fix for linking with gold, #386079
 
   27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   pidgin-2.10.0-r1.ebuild:
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
new file mode 100644
index 000000000000..819bfdc5c6bf
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
@@ -0,0 +1,30 @@
+ 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 = \
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 788e9617fa4a..7fdd4641a790 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-im</herd>
-<longdescription>
+	<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>
+	<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>
diff --git a/net-im/pidgin/pidgin-2.10.0-r2.ebuild b/net-im/pidgin/pidgin-2.10.0-r2.ebuild
new file mode 100644
index 000000000000..f0946b5c1e21
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.0-r2.ebuild
@@ -0,0 +1,227 @@
+# 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-r2.ebuild,v 1.1 2011/10/27 08:28:21 jlec 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? ( <dev-lang/python-3 )
+		python? ( <dev-lang/python-3 ) )
+	gtk? (
+		>=x11-libs/gtk+-2.10:2
+		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/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 )
+	!<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
+	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-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}/${P}-utf8-validation.patch" \
+		"${FILESDIR}/${P}-gold.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"
+}