Update dependency to mozilla-launcher-1.35 to help with #99084

(Portage version: 2.0.51.22-r1)

6 files changed, 8 insertions, 408 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 930d411952f9..02a6f2e45162 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.70 2005/07/17 19:48:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.71 2005/07/18 15:21:31 agriffis Exp $
+
+  18 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-thunderbird-1.0.2.ebuild, -mozilla-thunderbird-1.0.2-r1.ebuild,
+  mozilla-thunderbird-1.0.5.ebuild:
+  Update dependency to mozilla-launcher-1.35 to help with #99084
 
   17 Jul 2005; Jory A. Pratt <anarchy@gentoo.org>
   mozilla-thunderbird-1.0.5.ebuild:
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2
deleted file mode 100644
index 8d4815f5e901..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e5b8a3edb3ced400e769dc2faa45317 thunderbird-1.0.2-source.tar.bz2 33354397
-MD5 920f0e43e620d2c89934bd9bbf9b5d02 enigmail-0.90.2.tar.gz 340488
-MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r1 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r1
deleted file mode 100644
index dd5be6a022e0..000000000000
--- a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e5b8a3edb3ced400e769dc2faa45317 thunderbird-1.0.2-source.tar.bz2 33354397
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild
deleted file mode 100644
index a15ba5a78fa7..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2-r1.ebuild,v 1.4 2005/07/06 18:56:17 agriffis Exp $
-
-IUSE="crypt ldap"
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.2"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/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="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-RDEPEND="crypt? ( >=app-crypt/gnupg-1.4 )
-	>=www-client/mozilla-launcher-1.28"
-
-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
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
-
-	# GCC 4 compile patch ; bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
-
-	# 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/$(get_libdir)/MozillaThunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, and this breaks
-	# thunderbird
-	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() {
-	declare tb_libdir=/usr/$(get_libdir)/MozillaThunderbird
-
-	dodir ${tb_libdir}
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${tb_libdir}
-
-	# use the right theme for thunderbird #45609
-	if use crypt; then
-		mv ${D}${tb_libdir}/chrome/enigmail-skin-tbird.jar \
-			${D}${tb_libdir}/chrome/enigmail-skin.jar
-	fi
-
-	# fix permissions
-	chown -R root:root ${D}${tb_libdir}
-
-	# use mozilla-launcher which supports thunderbird as of version 1.6.
-	# version 1.7-r1 moved the script to /usr/libexec
-	dodir /usr/bin
-	cat <<EOF >${D}/usr/bin/thunderbird
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=thunderbird
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-	chmod 0755 ${D}/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}${tb_libdir}
-}
-
-pkg_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/MozillaThunderbird
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/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
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/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
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild
deleted file mode 100644
index e9ecb8baa5b8..000000000000
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.2.ebuild,v 1.13 2005/07/06 18:56:17 agriffis Exp $
-
-IUSE="crypt ldap"
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.90.2"
-IPCVER="1.1.2"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/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="alpha amd64 ia64 ppc sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-
-RDEPEND="crypt? ( >=app-crypt/gnupg-1.4 )
-	>=www-client/mozilla-launcher-1.28"
-
-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
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
-
-	# GCC 4 compile patch ; bug #87800
-	epatch ${FILESDIR}/${P}-gcc4.patch
-
-	# 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/$(get_libdir)/MozillaThunderbird
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# 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/$(get_libdir)
-	dodir /usr/$(get_libdir)/MozillaThunderbird
-	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/$(get_libdir)/MozillaThunderbird
-
-	# fix permissions
-	chown -R root:root ${D}/usr/$(get_libdir)/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
-	cat <<EOF >${D}/usr/bin/thunderbird
-#!/bin/sh
-# 
-# Stub script to run mozilla-launcher.  We used to use a symlink here but
-# OOo brokenness makes it necessary to use a stub instead:
-# http://bugs.gentoo.org/show_bug.cgi?id=78890
-
-export MOZILLA_LAUNCHER=thunderbird
-exec /usr/libexec/mozilla-launcher "\$@"
-EOF
-chmod 0755 ${D}/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/$(get_libdir)/MozillaThunderbird
-}
-
-pkg_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/usr/$(get_libdir)/MozillaThunderbird
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/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
-	#
-	# Bug 67031: Set HOME=~root in case this is being emerged via sudo.
-	# Otherwise the following commands will create ~/.mozilla owned by root
-	# and 700 perms, which makes subsequent execution of firefox by user
-	# impossible.
-	einfo "Registering Components and Chrome..."
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/MozillaThunderbird ${MOZILLA_FIVE_HOME}/regxpcom
-	HOME=~root LD_LIBRARY_PATH=/usr/$(get_libdir)/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
-}
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
index 216716e9757d..a164c3591856 100644
--- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild,v 1.9 2005/07/17 19:48:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild,v 1.10 2005/07/18 15:21:31 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE="ldap"
 
-RDEPEND=">=www-client/mozilla-launcher-1.34"
+RDEPEND=">=www-client/mozilla-launcher-1.35"
 
 S=${WORKDIR}/mozilla