4 files changed, 312 insertions, 2 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 8baf5090f843..d7af062ee614 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.192 2009/06/29 18:41:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.193 2009/07/10 18:52:01 nirbheek Exp $
+
+*seamonkey-1.1.17-r1 (10 Jul 2009)
+
+  10 Jul 2009; <nirbheek@gentoo.org> +seamonkey-1.1.17-r1.ebuild,
+  +files/seamonkey-1.1.17-fix-fno-strict-aliasing.patch:
+  Fix crash without -fno-strict-aliasing, bug 265642
 
   29 Jun 2009; Raúl Porcel <armin76@gentoo.org> -seamonkey-1.1.16.ebuild,
   seamonkey-1.1.17.ebuild:
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 30cb11a98502..c9e9f7415c62 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -2,10 +2,12 @@ AUX 10seamonkey 26 RMD160 156c113dfd25a106d5b72c4e6320bbf155d8775a SHA1 31aa4216
 AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b64f8be172be7ca8778e1548ee339a934 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a
 AUX icon/seamonkey.desktop 154 RMD160 7e1712122cee7510bf058024338e0b75ea7a5e9a SHA1 6f5e33c702fbaa86974e139e398399927462e31e SHA256 78ebd5d753065f6ecf148a010cb59a4756a8c94447cfac6f4db502864bac5d8c
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
+AUX seamonkey-1.1.17-fix-fno-strict-aliasing.patch 793 RMD160 07705e8c0bb41eb7af8e4339913e6f0c2f84eb8b SHA1 0da75e53380a3fe08de8cb617ef761ddd216078d SHA256 db3038447f22c9798d39b556714b197b95e150caca5e42c57c5b13f9c181b466
 AUX seamonkey-rebuild-databases.pl 2344 RMD160 27ae162b4028d80faeb802e575b41590f6ab314e SHA1 678cec60179997d1957a0c8ecb50169985f0b4e2 SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af
 DIST enigmail-0.95.7.tar.gz 1198743 RMD160 3e8c2544547b6d76cd9b4d95e374fe4a2c333b66 SHA1 ab9cfe90b272f466d2c236b4998070a142d5b609 SHA256 8832e722c25aeb15cbfbcdc6f2994e63fc49e42b59773430f02e2d8dbf90e445
 DIST seamonkey-1.1.15-patches-0.1.tar.bz2 22267 RMD160 d0f39d9eaae90980cca7de79a1f73521fb713a5c SHA1 6b4c3f5dd128b2ac253947c9682a3d4a6d804b5a SHA256 542eddad41c08f1ede22e6fc3b81547ee39cdd4b8230c11cbd7c846284589447
 DIST seamonkey-1.1.17.source.tar.bz2 38082419 RMD160 cc7ac7b80739537f340efa1ab543e878759ecde8 SHA1 81fea04abe908066311e5e13b268b078c45f577a SHA256 249eb89447658ef4d6974b784dd7ecfad9383924e3d7dc541d7f60525cee08a6
+EBUILD seamonkey-1.1.17-r1.ebuild 8479 RMD160 9ce43ce8119835838e7a79ba617ecd9c07af7cce SHA1 e088144a43fa9587f98cbb24372cd18bd9c79860 SHA256 8b3c3def0d72d83621e0712955fc602fb1e313677cbf40ac6410aca40dd8050e
 EBUILD seamonkey-1.1.17.ebuild 8354 RMD160 50eae62f50873532a89027cdc627e1bc7d254e38 SHA1 b9a0922a0c56dc39ece97ed9d6dbd2669940cdfe SHA256 3c772e2c539f1bc218a86f243d47f3c79c402d278b6d8786058c6bed101d3b74
-MISC ChangeLog 23349 RMD160 32afa232944f0f4c94c3bd064d6673cf093d045c SHA1 fa7a7c3290b7ed7340569a64a094b6cf063ed5fe SHA256 1486a281b50c0e71ddf43aa23e4bd9aadda54c5611e871509d61950d35387341
+MISC ChangeLog 23563 RMD160 6e621d42504135ad3f3b042500e844d0b88d4f5e SHA1 7fece1592d1dac78e136feee686e475eb5b8f7b1 SHA256 ad4d548b18a5be1a85aa9172a7c1190a26a9976d1ec5391436b505a24fcf3913
 MISC metadata.xml 746 RMD160 ef91ef32a2d5735afa0d30eb73aad20de6de252f SHA1 67545909f5f8920e083d708821b632899ada40a7 SHA256 360fa6a4ab7a705fd5d61ea16ff42c1c41f43ce8979b68a2567ac30b382ff46d
diff --git a/www-client/seamonkey/files/seamonkey-1.1.17-fix-fno-strict-aliasing.patch b/www-client/seamonkey/files/seamonkey-1.1.17-fix-fno-strict-aliasing.patch
new file mode 100644
index 000000000000..58c4ac2fbef0
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-1.1.17-fix-fno-strict-aliasing.patch
@@ -0,0 +1,21 @@
+Fix crashes without -fno-strict-aliasing. Patch from upstream see bug 265642
+
+---
+--- configure.in
++++ configure.in
+@@ -1172,6 +1172,7 @@
+ dnl GNU specific defaults
+ dnl ========================================================
+ if test "$GNU_CC"; then
++    CFLAGS="$CFLAGS -fno-strict-aliasing"
+     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     DSO_LDOPTS='-shared'
+@@ -1218,6 +1219,7 @@
+ fi
+ 
+ if test "$GNU_CXX"; then
++    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+     # Turn on GNU specific features
+     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+ 
diff --git a/www-client/seamonkey/seamonkey-1.1.17-r1.ebuild b/www-client/seamonkey/seamonkey-1.1.17-r1.ebuild
new file mode 100644
index 000000000000..b7020dc63f37
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-1.1.17-r1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.17-r1.ebuild,v 1.1 2009/07/10 18:52:01 nirbheek Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PATCH="${PN}-1.1.15-patches-0.1"
+EMVER="0.95.7"
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.seamonkey-project.org/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2
+	crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="java ldap mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt xforms"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.56
+	>=dev-libs/nss-3.11.5
+	>=dev-libs/nspr-4.6.5-r1
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=virtual/postgresql-server-7.2.0 )"
+
+S="${WORKDIR}/mozilla"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=suite
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	if ! built_with_use --missing true x11-libs/pango X; then
+		eerror "Pango is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge pango."
+		die "Pango needs X"
+	fi
+
+	use moznopango && warn_mozilla_launcher_stub
+}
+
+src_unpack() {
+	unpack ${P}.source.tar.bz2 ${PATCH}.tar.bz2
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	# Fix crash without -fno-strict-aliasing, bug 265642
+	epatch "${FILESDIR}/${P}-fix-fno-strict-aliasing.patch"
+
+	# Unpack the enigmail plugin
+	if use crypt && ! use moznomail; then
+		cd "${S}"/mailnews/extensions || die
+		unpack enigmail-${EMVER}.tar.gz
+		cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
+		makemake2
+	fi
+
+	# Fix scripts that call for /usr/local/bin/perl #51916
+	ebegin "Patching smime to call perl from /usr/bin"
+	sed -i -e '1s,usr/local/bin,usr/bin,' "${S}"/security/nss/cmd/smimetools/smime
+	eend $? || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate 'gentoo' --enable-canvas
+	mozconfig_annotate 'gentoo' --with-system-nspr
+	mozconfig_annotate 'gentoo' --with-system-nss
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate 'galeon' --enable-oji --enable-mathml
+
+	# Other moz-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+
+	if use moznoirc; then
+		mozconfig_annotate '+moznocompose +moznoirc' --enable-extensions=-irc
+	fi
+
+	if use moznoroaming ; then
+		mozconfig_annotate '+moznoroaming' --enable-extensions=-sroaming
+	fi
+
+	if use postgres ; then
+		mozconfig_annotate '+postgres' --enable-extensions=sql
+		export MOZ_ENABLE_PGSQL=1
+		export MOZ_PGSQL_INCLUDES=/usr/include
+		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+	fi
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.mozilla
+
+	if use moznomail; then
+		mozconfig_annotate "+moznomail" --disable-mailnews
+	fi
+
+	if use moznocompose; then
+		if use moznoirc && use moznomail; then
+			mozconfig_annotate "+moznocompose" --disable-composer
+		fi
+	fi
+
+	if use xforms; then
+		mozconfig_annotate "+xforms" --enable-extensions=xforms,schema-validation
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		"${S}"/config/autoconf.mk \
+		"${S}"/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+
+	####################################
+	#
+	#  Build Enigmail extension
+	#
+	####################################
+
+	if use crypt && ! use moznomail; then
+		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir "${MOZILLA_FIVE_HOME}"
+	cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed"
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp "${D}"${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		"${D}"${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/seamonkey
+	install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/icon/${PN}.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins "${S}"/widget/src/gtk/mozicon16.xpm
+	doins "${S}"/widget/src/gtk/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against seamonkey
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	cp -LfR "${S}"/dist/include "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+	cp -LfR "${S}"/dist/idl "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed"
+
+	# Fix mozilla-config and install it
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe "${S}"/build/unix/${PN}-config
+
+	# Install pkgconfig files
+	insinto /usr/"$(get_libdir)"/pkgconfig
+	doins "${S}"/build/unix/*.pc
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	doenvd "${FILESDIR}"/10${PN}
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+	# Install rebuild script since mozilla-bin doesn't support registration yet
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe "${FILESDIR}"/${PN}-rebuild-databases.pl
+	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+	# Install docs
+	dodoc "${S}"/{LEGAL,LICENSE}
+
+	# Update Google search plugin to use UTF8 charset ...
+	insinto ${MOZILLA_FIVE_HOME}/searchplugins
+	doins "${FILESDIR}"/google.src
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Remove entire installed instance to solve various problems,
+	# for example see bug 27719
+	rm -rf "${ROOT}"${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update the component registry
+	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+			/usr/libexec/mozilla-launcher -register
+	fi
+
+	update_mozilla_launcher_symlinks
+}