[patch] diff from thunderbird-bin-3.1.11.ebuild to thunderbird-bin-5.0_beta2.ebuild

tb-bin-3.1.11-5.0b2.diff (text/plain), 3.51 KB, created by dynamotwain on 2011-06-27 00:35:25 UTC

--- thunderbird-bin-3.1.11.ebuild	2011-06-26 17:21:58.000000000 -0700
+++ thunderbird-bin-5.0_beta2.ebuild	2011-06-26 17:32:07.000000000 -0700
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.11.ebuild,v 1.1 2011/06/23 14:13:51 polynomial-c Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils multilib mozextension
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 # '\' at EOL is needed for ${LANG} matching in linguas() below
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru \
-si sk sl sq sv-SE tr uk zh-CN zh-TW"
+LANGS="ar bg br ca cs da de en en-GB en-US es-AR es-ES et eu fi fr fy-NL \
+ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ru \
+si sk sl sq sv-SE ta-LK tr uk zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 MY_PN="${PN/-bin}"
@@ -19,8 +19,10 @@
 
 DESCRIPTION="Thunderbird Mail Client"
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2
-	mirror://gentoo/libnotify.so.1.bz2"
+SRC_URI="
+	amd64? ( ${REL_URI}/${MY_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
+		   mirror://gentoo/libnotify.so.1.bz2 )"
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip"
 
@@ -49,25 +51,12 @@
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXmu
-	x86? (
-		>=x11-libs/gtk+-2.2:2
-		net-misc/curl[nss]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-soundlibs
-	)"
+	>=x11-libs/gtk+-2.10:2
+	net-misc/curl[nss]
+	"
 
 S="${WORKDIR}/thunderbird"
 
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <[e-mail]> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
 linguas() {
 	local LANG SLANG
 	for LANG in ${LINGUAS}; do
@@ -134,28 +123,25 @@
 		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
 		die "failed to cp thunderbird-gentoo-default-prefs.js"
 
-	# This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
-	# http://bugs.gentoo.org/show_bug.cgi?id=360443.
-	exeinto /opt/thunderbird
-	doexe "${WORKDIR}"/libnotify.so.1 || die
+	if use x86; then
+		# This is a copy of 32bit libnotify.so.1 from app-emulation/emul-linux-x86-gtklibs-20110129.
+		# http://bugs.gentoo.org/show_bug.cgi?id=360443.
+		exeinto /opt/thunderbird
+		doexe "${WORKDIR}"/libnotify.so.1 || die
+	fi
+
+	ln -sfn "/usr/$(get_libdir)/nsbrowser/plugins" \
+			"${D}${MOZILLA_FIVE_HOME}/plugins" || die
 }
 
 pkg_postinst() {
 	#elog "For enigmail, please see instructions at"
 	#elog "  http://enigmail.mozdev.org/"
 
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
 		einfo
-		einfo "Crashreporter won't work on amd64"
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
 		einfo
 	fi