fixed a type in MOZILLA_FIVE_HOME

(Portage version: 2.0.51.22-r2)

5 files changed, 90 insertions, 100 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index 60232a0d5aa2..905eb46b1452 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.27 2005/07/22 20:40:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.28 2005/07/23 20:16:33 anarchy Exp $
+
+*mozilla-thunderbird-bin-1.0.6-r2 (23 Jul 2005)
+
+  23 Jul 2005; Jory A. Pratt <anarchy@gentoo.org>
+  -mozilla-thunderbird-bin-1.0.6.ebuild,
+  +mozilla-thunderbird-bin-1.0.6-r2.ebuild:
+  fixed typo in MOZILLA_FIVE_HOME
 
   22 Jul 2005; Aron Griffis <agriffis@gentoo.org>
   mozilla-thunderbird-bin-1.0.6-r1.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index 7c5afdf73530..52afe5d2b91b 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,11 +1,13 @@
-MD5 bc5c172ec57bb04b0e23faad148677bc mozilla-thunderbird-bin-1.0.5-r1.ebuild 2998
-MD5 ae94edca92a8f9c25662138b5d649ca7 mozilla-thunderbird-bin-1.0.6.ebuild 2996
 MD5 5f05915619f92ecf136f50f728b11605 ChangeLog 7385
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 bc5c172ec57bb04b0e23faad148677bc mozilla-thunderbird-bin-1.0.5-r1.ebuild 2998
+MD5 ae94edca92a8f9c25662138b5d649ca7 mozilla-thunderbird-bin-1.0.6.ebuild 2996
 MD5 2d061bc163b1f86452621a59d6260bd9 mozilla-thunderbird-bin-1.0.6-r1.ebuild 2000
-MD5 cac57af7f63e97aed3c1be35a58f7ea9 files/digest-mozilla-thunderbird-bin-1.0.5-r1 71
-MD5 aff32f49defdbb72570cd9a4a4a992e6 files/digest-mozilla-thunderbird-bin-1.0.6-r1 71
+MD5 d69bb129b0b6b78f8966cb312ee2a0f2 mozilla-thunderbird-bin-1.0.6-r2.ebuild 2008
 MD5 552a6947de77bfa4e290acdb23a872a5 files/thunderbird-bin-0.7-init.tar.bz2 3339
+MD5 cac57af7f63e97aed3c1be35a58f7ea9 files/digest-mozilla-thunderbird-bin-1.0.5-r1 71
 MD5 aff32f49defdbb72570cd9a4a4a992e6 files/digest-mozilla-thunderbird-bin-1.0.6 71
-MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
+MD5 aff32f49defdbb72570cd9a4a4a992e6 files/digest-mozilla-thunderbird-bin-1.0.6-r1 71
+MD5 aff32f49defdbb72570cd9a4a4a992e6 files/digest-mozilla-thunderbird-bin-1.0.6-r2 71
 MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
+MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.6 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.6-r2
index 8218d53fd53a..8218d53fd53a 100644
--- a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.6
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.6-r2
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6-r2.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..f00bc5213eed
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6-r2.ebuild
@@ -0,0 +1,75 @@
+# 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-bin/mozilla-thunderbird-bin-1.0.6-r2.ebuild,v 1.1 2005/07/23 20:16:33 anarchy Exp $
+
+inherit eutils mozilla-launcher
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/x11
+	x86? (
+		>=sys-libs/lib-compat-1.0-r2
+		>=x11-libs/gtk+-2.2
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-2.1.1
+		>=app-emulation/emul-linux-x86-gtklibs-2.1
+	)
+	>=www-client/mozilla-launcher-1.41"
+
+S=${WORKDIR}/thunderbird
+
+# This is a binary x86 package => ABI=x86
+# Please keep this in future versions
+# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+has_multilib_profile && ABI="x86"
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/thunderbird
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv ${S} ${D}${MOZILLA_FIVE_HOME}
+
+	# Install /usr/bin/thunderbird-bin
+	install_mozilla_launcher_stub thunderbird-bin ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozillathunderbird-bin-icon.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird-bin.desktop
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/opt/thunderbird
+
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	einfo "For enigmail, please see instructions at"
+	einfo "  http://enigmail.mozdev.org/"
+
+	if use amd64; then
+		echo
+		einfo "NB: You just installed a 32-bit thunderbird"
+	fi
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6.ebuild
deleted file mode 100644
index d044d6e3737a..000000000000
--- a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.6.ebuild
+++ /dev/null
@@ -1,94 +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-bin/mozilla-thunderbird-bin-1.0.6.ebuild,v 1.1 2005/07/20 04:01:09 anarchy Exp $
-
-inherit nsplugins eutils mozilla-launcher
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/thunderbird
-
-DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz"
-
-HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
-RESTRICT="nostrip"
-
-KEYWORDS="-* ~x86 ~amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	>=dev-libs/libIDL-0.8.0
-	>=x11-libs/gtk+-2.1.1
-	virtual/xft
-	>=media-libs/jpeg-6b
-	>=media-libs/libmng-1.0.0
-	>=media-libs/libpng-1.2.1
-	dev-libs/expat
-	app-arch/zip
-	app-arch/unzip
-	>=www-client/mozilla-launcher-1.35
-	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.1.1
-			 >=app-emulation/emul-linux-x86-gtklibs-2.1 )"
-
-src_install() {
-	# Install thunderbird in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/thunderbird
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/thunderbird
-
-	# Install /usr/bin/thunderbird-bin
-	install_mozilla_launcher_stub thunderbird-bin /opt/thunderbird
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozillathunderbird-bin-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-bin.desktop
-
-	# Normally thunderbird-bin-0.7 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 firefox-bin-${PV} initialization files"
-	tar xjpf ${FILESDIR}/thunderbird-bin-0.7-init.tar.bz2 \
-		-C ${D}/opt/thunderbird
-}
-
-pkg_preinst() {
-	# Remove entire installed instance to solve various
-	# problems, for example see bug 27719
-	rm -rf ${ROOT}/opt/MozillaThunderbird
-	rm -rf ${ROOT}/opt/thunderbird
-}
-
-pkg_postinst() {
-	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
-	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
-	einfo "on Install Extension to install Enigmail in your Thunderbird build."
-	einfo "Restart Thunderbird after having installed both extensions."
-	einfo ""
-	einfo "The extensions are located at http://enigmail.mozdev.org/"
-	einfo ""
-	einfo "Please note that the binary name has changed from MozillaThunderbird"
-	einfo "to simply thunderbird-bin"
-	einfo ""
-
-	if use amd64; then
-		einfo "You just installed a thunderbird version pre-built for 32 bits"
-		einfo "system."
-	fi
-	# 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() {
-	update_mozilla_launcher_symlinks
-}