Respect users ldflags when building ldap support

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

4 files changed, 362 insertions, 2 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 7e85500cd4d3..bc824d5f7844 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.283 2010/12/11 19:38:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.284 2010/12/25 22:48:31 anarchy Exp $
+
+*seamonkey-2.0.11-r1 (25 Dec 2010)
+
+  25 Dec 2010; Jory A. Pratt <anarchy@gentoo.org> +seamonkey-2.0.11-r1.ebuild,
+  +files/seamonkey-respect-ldflags.patch:
+  Respect users ldflags when building ldap support, bug #348405
 
   11 Dec 2010; Brent Baude <ranger@gentoo.org> seamonkey-2.0.11.ebuild:
   Marking seamonkey-2.0.11 ppc64 for bug 348316
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 3959dec0e8e6..778c4341d282 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -4,6 +4,7 @@ AUX enigmail/70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c87
 AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 AUX seamonkey-2.0-gtk+-2.21.patch 264 RMD160 673daae210b9f38bbcd36bd08483352a2bbe288c SHA1 3b7a794094b02dc6addc0bed720d2bfbc82a23f3 SHA256 7df84babcee420f0d1970c070b76ff455a0a03a97f431bc85aec17dcdd580e81
+AUX seamonkey-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e47621ab334 SHA1 fec674ca325de52a547af336864b66e113fb2df7 SHA256 3db9aea0cdfc77c6c7de20591a44b92eecb9636fdb6c45676a173905a8bd7ae1
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 DIST seamonkey-2.0.10-be.xpi 482578 RMD160 0adf6826b91d832f775c9e19ab608465382a5a0b SHA1 4c7d802fcca636a7b36c764261f80ff4b75592e0 SHA256 9f40ff6a3b0b49fd77dcac68b5cb434a34b09a5dbb6c9bc469a4ead278e899e1
 DIST seamonkey-2.0.10-ca.xpi 488149 RMD160 86ab0223fcb77f1fecd2125efc7a7b054a54d5d9 SHA1 0ac38648d645e524c6c056d1b2537461d651025a SHA256 f790f1f44ea6549dd62cfc4677ed909b9a0f39023b005de2e6b70f84074a3d06
@@ -56,6 +57,7 @@ DIST seamonkey-2.0.11-zh-CN.xpi 503868 RMD160 fb5aca29c833e8aac15db1045d4a738267
 DIST seamonkey-2.0.11.source.tar.bz2 61641109 RMD160 146485d3ccb84d921fbd563c1c863e40016079f7 SHA1 ddcb0a0fb76aa239117c375dbe3ac7969d0ed421 SHA256 1b72c28d1e459b5c4968e47c5540948a76037f4d2343f01ad4b46089aac16d2f
 DIST seamonkey-2.0.7-patches-01.tar.bz2 15779 RMD160 b601a910c09ffa6c23db19e5e089e7759556ca92 SHA1 f6f4f6a6028089652425911fe5ac9a0f4ab52fe9 SHA256 8584bc566c408a58f1ce77da308c10cd9c7ef36637970424be124013454e9fbb
 EBUILD seamonkey-2.0.10.ebuild 9457 RMD160 eb91098e510a7da65a991f7f37cd400a74f0917f SHA1 2d2a549944cb8fff203605feecc619741c95c945 SHA256 4ebc3b0e30ef8df8faeb6cf3bc8044adb5159498b669b45b9ce3f9706c57c7b0
+EBUILD seamonkey-2.0.11-r1.ebuild 9570 RMD160 017ba181f7e1f0852aeace41978bd71c664c45eb SHA1 b927dfd31fb6fb8011b74288e853f3b4e9b91c80 SHA256 b77239b0950eea5954386b348be77238483fff5a202681a10fbac33e778e4c2b
 EBUILD seamonkey-2.0.11.ebuild 9462 RMD160 791fb9a56ff0f05384bf31ade48c6b6dccc06f6f SHA1 c8dd0dde42fc23ec7ac03fd125e764fd4626fb99 SHA256 3010f1733b484efe90b9cc501ad357dec253bf43fd57ba326b4fb06a9974d6fe
-MISC ChangeLog 36306 RMD160 6726d258abcaafbad54f5e3823168d1182f06423 SHA1 de4dee7379a8b84717c56df25191308b0074f5b1 SHA256 7e1deaac1c1b0737cd7f4e0b3365fba0aa6188f47dc630e164a963c8babc2d1a
+MISC ChangeLog 36529 RMD160 1a2a7da8920f0174e359815e1777e896c8c3c519 SHA1 f4de483b788c7c52e1a0a1dde215c5fbfd09e1cd SHA256 0b8f37e70052cad2ac93ff114733c015a9ec2552a4c571d0785414d454892b27
 MISC metadata.xml 845 RMD160 d313bde4cd255346a825ea0d99afb7585151cc0f SHA1 7941c776107161a6278ba5893345aeac2a5cbe7a SHA256 404caecf817491893c2ef118b48f025bc0d5c37d910979dd5602273127e479f9
diff --git a/www-client/seamonkey/files/seamonkey-respect-ldflags.patch b/www-client/seamonkey/files/seamonkey-respect-ldflags.patch
new file mode 100644
index 000000000000..c35ec6430fbf
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-respect-ldflags.patch
@@ -0,0 +1,28 @@
+--- a/directory/c-sdk/build.mk	2010-12-11 08:46:14.137000000 -0600
++++ b/directory/c-sdk/build.mk	2010-12-11 08:46:17.443000000 -0600
+@@ -488,21 +488,21 @@
+ LINK_LIB2       = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
+ ifneq ($(LD),$(CC))
+ ifdef SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS)
+ else # SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(OBJS)
+ endif # SONAMEFLAG_PREFIX
+ else  # $(CC) is used to link libs
+ ifdef SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS)
+ else # SONAMEFLAG_PREFIX
+-LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \
++LINK_DLL        = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS)\
+                         $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \
+                         -o $@ $(OBJS)
+ endif # SONAMEFLAG_PREFIX
diff --git a/www-client/seamonkey/seamonkey-2.0.11-r1.ebuild b/www-client/seamonkey/seamonkey-2.0.11-r1.ebuild
new file mode 100644
index 000000000000..bf184884dbb2
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.0.11-r1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.11-r1.ebuild,v 1.1 2010/12/25 22:48:31 anarchy Exp $
+
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2
+
+PATCH="${PN}-2.0.7-patches-01"
+EMVER="1.0.1"
+
+LANGS="be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja ka lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
+NOSHORTLANGS="en-GB es-AR es-ES nb-NO pt-PT sv-SE zh-CN"
+
+MY_PV="${PV/_pre*}"
+MY_PV="${MY_PV/_alpha/a}"
+MY_PV="${MY_PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+# release versions usually have language packs. So be careful with changing this.
+HAS_LANGS="true"
+if [[ ${PV} == *_pre* ]] ; then
+	# pre-releases. No need for arch teams to change KEYWORDS here.
+
+	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
+	#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS=""
+	#HAS_LANGS="false"
+else
+	# This is where arch teams should change the KEYWORDS.
+
+	REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
+fi
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa +chatzilla +composer +crypt java ldap +mailclient +roaming system-sqlite"
+
+SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2
+	crypt? ( mailclient? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) )"
+
+if ${HAS_LANGS} ; then
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X/-/_}"
+		# english is handled internally
+		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+			if [ "${X}" != "en-US" ]; then
+				SRC_URI="${SRC_URI}
+					linguas_${X%%-*}? ( ${REL_URI}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+RDEPEND="java? ( virtual/jre )
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.8
+	>=dev-libs/nspr-4.8.6
+	alsa? ( media-libs/alsa-lib )
+	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	>=app-text/hunspell-1.2
+	>=x11-libs/gtk+-2.10.0
+	>=x11-libs/pango-1.14.0[X]
+	crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	java? ( >=virtual/jdk-1.4 )"
+
+S="${WORKDIR}/comm-1.9.1"
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if ${HAS_LANGS} ; then
+		linguas
+		for X in ${linguas}; do
+			# FIXME: Add support for unpacking xpis to portage
+			[[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
+		done
+		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+			einfo "Selected language packs (first will be default): ${linguas}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	export BUILD_OFFICIAL=1
+	export MOZILLA_OFFICIAL=1
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patch"
+
+	epatch "${FILESDIR}"/bug-606109.patch
+	epatch "${FILESDIR}"/${PN}-2.0-gtk+-2.21.patch
+
+	# Respect ldflags when building ldap support.
+	epatch "${FILESDIR}/${PN}-respect-ldflags.patch"
+
+	if use crypt && use mailclient ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"/mailnews/extensions/enigmail || die
+		epatch "${FILESDIR}"/enigmail/70_enigmail-fix.patch
+		makemake2
+		cd "${S}"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS=""
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# seamonkey has issues with >=x11-libs/cairo-1.10.0 (bug #337813).
+	# If you don't like this blame upstream as they don't care about
+	# anything than their damned bundled shit!!!
+	sed '/--enable-system-cairo/s:enable:disable:' -i "${S}"/.mozconfig \
+		|| die
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS="${MEXTENSIONS},-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS="${MEXTENSIONS},-sroaming"
+	fi
+
+	if ! use gnome ; then
+		MEXTENSIONS="${MEXTENSIONS},-gnomevfs"
+	fi
+
+	if ! use composer ; then
+		if ! use chatzilla && ! use mailclient ; then
+			mozconfig_annotate '-composer' --disable-composer
+		fi
+	fi
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=suite
+	mozconfig_annotate 'broken' --disable-mochitest
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-printing
+
+	# Enable/Disable based on USE flags
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_use_enable mailclient mailnews
+	mozconfig_use_enable system-sqlite
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break.
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+
+	# Only build enigmail extension if conditions are met.
+	if use crypt && use mailclient ; then
+		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+		emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use crypt && use mailclient ; then
+		cd "${T}" || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if ${HAS_LANGS} ; then
+		linguas
+		for X in ${linguas}; do
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}"
+		done
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
+	domenu "${FILESDIR}"/icon/seamonkey.desktop || die
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
+	fi
+
+	# Add our default prefs
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
+		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js
+
+	# Plugins dir
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir"
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die
+
+	# shiny new man page
+	doman "${S}"/suite/app/${PN}.1 || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}