use mozconfig.eclass instead of mozilla.eclass for building

4 files changed, 193 insertions, 10 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 7a8beb8f44ee..6f52151cf392 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.31 2004/11/06 08:21:27 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.32 2004/11/13 23:33:58 agriffis Exp $
+
+*mozilla-thunderbird-0.9-r1 (13 Nov 2004)
+
+  13 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-thunderbird-0.9-r1.ebuild:
+  use mozconfig.eclass instead of mozilla.eclass for building
 
 *mozilla-thunderbird-0.9 (06 Nov 2004)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 31bccbdfe8cf..af129d7c481e 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,17 +1,19 @@
+MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
+MD5 215e8be28f5628b230f3ae338c29f7bd ChangeLog 2234
+MD5 4518a5d1d22227e08aec91e2a800fb2a mozilla-thunderbird-0.9.ebuild 5018
 MD5 847af952c8b65f8be7e1fea2d114e807 mozilla-thunderbird-0.8.ebuild 5014
 MD5 be10069a89669d1f424f9279479aa597 mozilla-thunderbird-0.7.3-r1.ebuild 4880
-MD5 4518a5d1d22227e08aec91e2a800fb2a mozilla-thunderbird-0.9.ebuild 5018
-MD5 215e8be28f5628b230f3ae338c29f7bd ChangeLog 2234
-MD5 5dd0418c191830dfcfd74400e3f9608c metadata.xml 182
-MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3-r1 207
+MD5 b4f093b51dfc5669bc5bbaf5e45d234f mozilla-thunderbird-0.9-r1.ebuild 5168
 MD5 1adb062c6ed356e75ec53d1e35c9d350 files/MozillaThunderbird 302
-MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 d454e31be912afe393cec7e6eddeaa72 files/digest-mozilla-thunderbird-0.9 205
+MD5 63e247da983ffc7766b795be757e00e6 files/digest-mozilla-thunderbird-0.7.3-r1 207
+MD5 d454e31be912afe393cec7e6eddeaa72 files/digest-mozilla-thunderbird-0.9-r1 205
 MD5 2f72a8b70f733c46b922c38c3d9afb46 files/ipc-1.0.6-nsPipeChannel.patch 614
 MD5 9c81a4440289d9f3a44b142b9217d845 files/digest-mozilla-thunderbird-0.8 205
-MD5 d454e31be912afe393cec7e6eddeaa72 files/digest-mozilla-thunderbird-0.9 205
+MD5 1adb062c6ed356e75ec53d1e35c9d350 files/thunderbird 302
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
-MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
+MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.9-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.9-r1
new file mode 100644
index 000000000000..629865f5c723
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-0.9-r1
@@ -0,0 +1,3 @@
+MD5 38735d351e44d08dd4376d349a7d3992 thunderbird-0.9-source.tar.bz2 33197138
+MD5 52bf78d1976478fb7bb485b7754d13ff enigmail-0.86.0.tar.gz 327816
+MD5 0109af0c56b20f8dfd7f3bb080b4a148 ipc-1.0.8.tar.gz 102374
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.9-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.9-r1.ebuild
new file mode 100644
index 000000000000..8153ad29f6fc
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.9-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-0.9-r1.ebuild,v 1.1 2004/11/13 23:33:58 agriffis Exp $
+
+IUSE="crypt gtk2"
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozconfig mozilla-launcher makeedit
+
+EMVER="0.86.0"
+IPCVER="1.0.8"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/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 ~ia64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+RDEPEND="crypt? ( >=app-crypt/gnupg-1.2.1 )"
+
+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_THUNDERBIRD=1
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# Unpack the enigmail plugin
+	if use crypt; then
+		for x in ipc enigmail; do
+			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
+			cd ${S}/extensions/${x} || die "cd failed"
+			makemake	# from mozilla.eclass
+		done
+	fi
+}
+
+src_compile() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/MozillaThunderbird
+
+	# Report settings
+	mozconfig_explain
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# firefox.
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf || die "econf failed"
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake MOZ_THUNDERBIRD=1 || die "emake failed"
+
+	# Build the enigmail plugin
+	if use crypt; then
+		einfo "Building Enigmail plugin..."
+		cd ${S}/extensions/ipc || die "cd ipc failed"
+		make || die "make ipc failed"
+
+		cd ${S}/extensions/enigmail || die "cd enigmail failed"
+		make || die "make enigmail failed"
+	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
+
+	# use mozilla-launcher which supports thunderbird as of version 1.6.
+	# version 1.7-r1 moved the script to /usr/libexec
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/thunderbird
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.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/mozillathunderbird.desktop
+
+	# Normally thunderbird-0.7.1 must be run as root once before it can
+	# be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting thunderbird-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-0.7-init.tar.bz2 \
+		-C ${D}/usr/lib/MozillaThunderbird
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/usr/lib/MozillaThunderbird
+}
+
+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 {} \; || :
+
+	# 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
+
+	einfo
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply thunderbird"
+	einfo
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}