Xinerama support, new enigmail

4 files changed, 247 insertions, 7 deletions

diff --git a/net-mail/mozilla-thunderbird/ChangeLog b/net-mail/mozilla-thunderbird/ChangeLog
index 69de7ab89e42..07de12e978de 100644
--- a/net-mail/mozilla-thunderbird/ChangeLog
+++ b/net-mail/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mozilla-thunderbird
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.22 2004/02/24 00:26:28 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/ChangeLog,v 1.23 2004/03/07 17:20:58 brad Exp $
+
+*mozilla-thunderbird-0.5-r1 (07 Mar 2004)
+
+  07 Mar 2004; Brad Laue <brad@gentoo.org> mozilla-thunderbird-0.5-r1.ebuild:
+  New version of enigmail, add Xinerama support.
 
   24 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
   mozilla-thunderbird-0.5.ebuild:
diff --git a/net-mail/mozilla-thunderbird/Manifest b/net-mail/mozilla-thunderbird/Manifest
index 55e45fbb0cbd..31c31b635ce7 100644
--- a/net-mail/mozilla-thunderbird/Manifest
+++ b/net-mail/mozilla-thunderbird/Manifest
@@ -1,13 +1,15 @@
-MD5 f633b002eaf7c3d704cc59015650861b mozilla-thunderbird-0.5.ebuild 6298
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 6a1acd4f11a1b5c51270050a95b369f0 mozilla-thunderbird-0.5-r1.ebuild 6480
 MD5 149b75bd986e9e61881379c64fb0652c mozilla-thunderbird-0.3-r1.ebuild 6026
 MD5 63bedca71944049de67d31f067e02013 mozilla-thunderbird-0.4.ebuild 6104
-MD5 af3442ddcc70f3a7c082505d232378ad ChangeLog 4146
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
-MD5 beae854b9d4ea6dd5507f36d8ceaf4a6 files/digest-mozilla-thunderbird-0.3-r1 205
+MD5 50925bfc9af7d4a7dbb098f4d5d397f1 ChangeLog 4316
+MD5 f633b002eaf7c3d704cc59015650861b mozilla-thunderbird-0.5.ebuild 6298
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
+MD5 beae854b9d4ea6dd5507f36d8ceaf4a6 files/digest-mozilla-thunderbird-0.3-r1 205
 MD5 64eb8d1ba171c75896ced1eddd4e42ba files/digest-mozilla-thunderbird-0.4 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
 MD5 157a0b64fbfa81bff58ed90c9590ae79 files/digest-mozilla-thunderbird-0.5 205
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-thunderbird-amd64.patch 35052
+MD5 f981a963a4840e1880440f1f77ea54b2 files/digest-mozilla-thunderbird-0.5-r1 205
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1 b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
new file mode 100644
index 000000000000..75dca779af64
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.5-r1
@@ -0,0 +1,3 @@
+MD5 dbbb30f8e6976fbc716c377182e5a11e thunderbird-0.5-source.tar.bz2 31180197
+MD5 70d1b085d8b2ed7c82b6666fa1d537af enigmail-0.83.3.tar.gz 325747
+MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083
diff --git a/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
new file mode 100644
index 000000000000..897a01dfe849
--- /dev/null
+++ b/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mozilla-thunderbird/mozilla-thunderbird-0.5-r1.ebuild,v 1.1 2004/03/07 17:20:58 brad Exp $
+
+inherit makeedit flag-o-matic gcc nsplugins
+
+# Added to get thunderbird to compile on sparc.
+replace-sparc64-flags
+if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
+then
+
+append-flags -fno-strict-aliasing
+
+fi
+
+
+S=${WORKDIR}/mozilla
+
+EMVER="0.83.3"
+IPCVER="1.0.5"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="mirror://gentoo/thunderbird-${PV}-source.tar.bz2
+	 crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
+	   		  http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz )"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+SLOT="0"
+LICENSE="MPL-1.1 | NPL-1.1"
+IUSE="gtk2 ipv6 crypt xinerama"
+
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* )
+		crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+DEPEND="${RDEPEND}
+	virtual/glibc
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+# needed by src_compile() and src_install()
+export MOZ_THUNDERBIRD=1
+export MOZ_ENABLE_XFT=1
+
+#pkg_setup() {
+#	einfo "Please unmerge previous installs of Mozilla Thunderbird before"
+#	einfo "merging this. Running emerge unmerge mozilla-thunderbird && rm -rf"
+#	einfo "/usr/lib/MozillaThunderbird will ensure that all files are"
+#	einfo "removed. If you need to do this, please press ctrl-c now and"
+#	einfo "resume emerging once you're done."
+#	sleep 5
+#}
+
+src_unpack() {
+
+	unpack thunderbird-${PV}-source.tar.bz2
+
+	# Unpack the enigmail plugin
+	if use crypt
+		then
+			unpack ipc-${IPCVER}.tar.gz
+			unpack enigmail-${EMVER}.tar.gz
+
+			mv -f ${WORKDIR}/ipc ${S}/extensions/
+			mv -f ${WORKDIR}/enigmail ${S}/extensions/
+			cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
+			cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+	fi
+
+	use amd64 && epatch ${FILESDIR}/mozilla-thunderbird-amd64.patch
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaThunderbird \
+		--with-user-appdir=.thunderbird \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-profilesharing \
+		--disable-necko-disk-cache \
+		--disable-activex-scripting \
+		--disable-installer \
+		--disable-activex \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-optimize="-O2" \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=wallet,spellcheck \
+		--enable-necko-protocols=http,file,jar,viewsource,res,data \
+		--enable-image-decoders=png,gif,jpeg"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Check for xinerama - closes #19369
+	if [ -n "`use xinerama`" ] ; then
+		myconf="${myconf} --enable-xinerama=yes"
+	else
+		myconf="${myconf} --enable-xinerama=no"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer -mpowerpc-gfxopt
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_THUNDERBIRD=1 || die
+
+	# Build the enigmail plugin
+	if use crypt
+	then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc
+		make || die
+
+		cd ${S}/extensions/enigmail
+		make || die
+	fi
+}
+
+src_install() {
+	dodir /usr/lib
+	dodir /usr/lib/MozillaThunderbird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaThunderbird
+
+	#fix permissions
+	chown -R root:root ${D}/usr/lib/MozillaThunderbird
+
+	dobin ${FILESDIR}/thunderbird
+
+	# Install icon and .desktop for menu entry
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins ${S}/build/package/rpm/SOURCES/mozilla-icon.png
+
+		# Fix comment of menu entry
+		cd ${S}/build/package/rpm/SOURCES
+		cp mozilla.desktop mozillathunderbird.desktop
+		perl -pi -e 's:Name=Mozilla:Name=Mozilla Thunderbird:' mozillathunderbird.desktop
+		perl -pi -e 's:Comment=Mozilla:Comment=Mozilla Thunderbird Mail Client:' mozillathunderbird.desktop
+		perl -pi -e 's:Exec=/usr/bin/mozilla:Exec=/usr/bin/thunderbird:' mozillathunderbird.desktop
+		cd ${S}
+		insinto /usr/share/gnome/apps/Internet
+		doins ${S}/build/package/rpm/SOURCES/mozillathunderbird.desktop
+	fi
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaThunderbird"
+
+	# Fix permissions on misc files
+	find ${MOZILLA_FIVE_HOME}/ -perm 0700 -exec chmod 0755 {} \; || :
+
+	# Needed to update the run time bindings for REGXPCOM
+	# (do not remove next line!)
+	env-update
+	# Register Components and Chrome
+	einfo "Registering Components and Chrome..."
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
+	LD_LIBRARY_PATH=${ROOT}/usr/lib/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regchrome
+	# Fix permissions of component registry
+	chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat
+	# Fix directory permissions
+	find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || :
+	# Fix permissions on chrome files
+	find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || :
+
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply 'thunderbird'."
+}