enigmail support bug #125055, typeahead patch drop'd bug #125080

(Portage version: 2.1_pre6-r7)

4 files changed, 329 insertions, 1 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 029548d6ff27..c24f1be0aa33 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.3 2006/03/20 00:23:16 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.4 2006/03/26 01:03:10 anarchy Exp $
+
+*seamonkey-1.0-r1 (26 Mar 2006)
+
+  26 Mar 2006; Jory A. Pratt <anarchy@gentoo.org> +seamonkey-1.0-r1.ebuild:
+  enigmail support bug #125055, typeahead patch drop'd bug #125080
 
   20 Mar 2006; Jory A. Pratt <anarchy@gentoo.org> seamonkey-1.0.ebuild:
   revision to patchset for glibc-2.4 wrt bug#125832
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index b6874db9d023..2c6deecfa46b 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -7,6 +7,9 @@ SHA256 e3af11f2fefe5d7375b2ef136ab9f5de7d2f9a697b08f9a0744a49bac3fe2de7 files/10
 MD5 1b88e661899ac2158a1dc501af1ac5d8 files/digest-seamonkey-1.0 548
 RMD160 d0ada96f36a7b48dc780effbb7e8634d58cadbaf files/digest-seamonkey-1.0 548
 SHA256 81f002371b6f4b70b45dfe75026df205863621fcf88bf0eb1154f0925deb1a2c files/digest-seamonkey-1.0 548
+MD5 d9aaf032e3bd1eb2030e2aa7089cd8e5 files/digest-seamonkey-1.0-r1 795
+RMD160 1ed7dbd27046232ae12cf9c779d48563cac84e6f files/digest-seamonkey-1.0-r1 795
+SHA256 789181b9c73a1c2cdd1bf8009efbe98f4016ccfb9a124fc0640e75e94d66e132 files/digest-seamonkey-1.0-r1 795
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 files/google.src 706
 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a files/google.src 706
@@ -22,6 +25,9 @@ SHA256 fde49923b949fc300040490e404a9f65b5777e8e7440fd8f0907d17b041fb2af files/se
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
+MD5 402f0279a37e45143b26e29825c53bf0 seamonkey-1.0-r1.ebuild 9548
+RMD160 4279016ae408c425c83fff34233792771a48c06f seamonkey-1.0-r1.ebuild 9548
+SHA256 33b9cb3e0a6c9bf90e86f987c6fcd2896ecc660df9a7e32b4ea65bfc34da9514 seamonkey-1.0-r1.ebuild 9548
 MD5 ba3e2284d5bf4f04799183c314163183 seamonkey-1.0.ebuild 8922
 RMD160 c9c355b073b22475082944b4b05b764268c8c9df seamonkey-1.0.ebuild 8922
 SHA256 7aee61eb25e6ec1b576d426470575d4b49518c982bb7425e87357e753fe05a5d seamonkey-1.0.ebuild 8922
diff --git a/www-client/seamonkey/files/digest-seamonkey-1.0-r1 b/www-client/seamonkey/files/digest-seamonkey-1.0-r1
new file mode 100644
index 000000000000..9fdf6462dc8b
--- /dev/null
+++ b/www-client/seamonkey/files/digest-seamonkey-1.0-r1
@@ -0,0 +1,9 @@
+MD5 d326c302c1d2d68217fffcaa01ca7632 enigmail-0.94.0.tar.gz 508113
+RMD160 0fa8f0384b74623c1b84a048bdbf04bfca8c1824 enigmail-0.94.0.tar.gz 508113
+SHA256 db2b5fc014fe5efef95fc46804ac609616557b1696d5f355d2d7641e567904f3 enigmail-0.94.0.tar.gz 508113
+MD5 5546389e18a3b11c7850cc6bb2408be3 seamonkey-1.0-patches-0.4.tar.bz2 24847
+RMD160 a87322270b600f5274fb05420b90e3914a55f3fc seamonkey-1.0-patches-0.4.tar.bz2 24847
+SHA256 f8a291257ef8c61467476e61ca2f378f5a089798abdbd051213130c86e642fdf seamonkey-1.0-patches-0.4.tar.bz2 24847
+MD5 e4f2edc5b2248d090303c70f5b28f210 seamonkey-1.0.source.tar.bz2 34860577
+RMD160 2785193e84a85b5570a4905221a54092d32aef15 seamonkey-1.0.source.tar.bz2 34860577
+SHA256 e28cff7411992f1468d098806a427397114ea64a12a425c7c6be8b49e891f334 seamonkey-1.0.source.tar.bz2 34860577
diff --git a/www-client/seamonkey/seamonkey-1.0-r1.ebuild b/www-client/seamonkey/seamonkey-1.0-r1.ebuild
new file mode 100644
index 000000000000..15055442f865
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-1.0-r1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.0-r1.ebuild,v 1.1 2006/03/26 01:03:10 anarchy Exp $
+
+unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozcoreconf mozconfig-2 mozilla-launcher makeedit multilib autotools
+
+PVER="0.4"
+EMVER="0.94.0"
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${PV}/${P}.source.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${P}-patches-${PVER}.tar.bz2
+	crypt? ( !moznomail? ( http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz ) )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="java ldap  mozcalendar mozdevelop moznocompose moznoirc moznomail moznoroaming postgres crypt"
+
+RDEPEND="java? ( virtual/jre )
+	>=www-client/mozilla-launcher-1.47
+	>=dev-libs/nss-3.10
+	>=dev-libs/nspr-4.6.1
+	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.4 ) )"
+
+DEPEND="${RDEPEND}
+	~sys-devel/autoconf-2.13
+	java? ( >=dev-java/java-config-0.2.0 )
+	dev-lang/perl
+	postgres? ( >=dev-db/postgresql-7.2.0 )
+	!www-client/mozilla"
+
+S=${WORKDIR}/mozilla
+
+pkg_setup() {
+	if ! use moznoirc && use moznocompose; then
+		ewarn ""
+		ewarn "It looks like you want to have Chatzilla but don't want to have"
+		ewarn "Composer. This cannot be done, because Chatzilla does not work"
+		ewarn "without Composer. Composer will be build."
+		ewarn ""
+		ewarn "Continuing in 10 seconds.."
+		ewarn ""
+		epause 10
+	fi
+	if use mozcalendar && use moznomail; then
+		ewarn ""
+		ewarn "It looks like you want to have Calendar but don't want to have"
+		ewarn "Mail. This cannot be done, because Calendar does not work"
+		ewarn "without Mail. Mail will be build."
+		ewarn ""
+		ewarn "Continuing in 10 seconds.."
+		ewarn ""
+		epause 10
+	fi
+	if ! use moznomail && use moznocompose; then
+		ewarn ""
+		ewarn "It looks like you want to have Mail but don't want to have"
+		ewarn "Composer. This cannot be done, because Mail does not work"
+		ewarn "without Composer. Composer will be build."
+		ewarn ""
+		ewarn "Continuing in 10 seconds.."
+		ewarn ""
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+
+	cd ${S} || die "cd failed"
+	EPATCH_FORCE="yes" epatch ${WORKDIR}/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"
+
+	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
+	# -- hansmi, 2005-10-02
+	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+			${S}/configure.in
+		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+			${S}/security/coreconf/arch.mk
+	fi
+
+	cd ${S}
+	# Needed by some of the patches
+	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+}
+
+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 mozcalendar calendar
+	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 && ! use mozcalendar; then
+		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+	fi
+
+	if use moznocompose && ! use mozcalendar; then
+		if use moznoirc && use moznomail; then
+			mozconfig_annotate "+moznocompose" --disable-composer
+		fi
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	append-flags -freorder-blocks -fno-reorder-functions
+
+	####################################
+	#
+	#  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}/nsprpub/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}
+
+	# 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/mozilla
+	install_mozilla_launcher_stub seamonkey ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/${PN}.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${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 mozilla
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
+
+	# Fix mozilla-config and install it
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/${PN}-config
+
+	# Fix pkgconfig files and install them
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running mozilla, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${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
+}