[gentoo-commits] gentoo-x86 commit in mail-client/thunderbird-bin: ChangeLog thunderbird-bin-10.0.ebuild

[Nirbheek Chauhan (nirbheek)]

nirbheek    12/02/04 18:35:28

  Modified:             ChangeLog thunderbird-bin-10.0.ebuild
  Log:
  Port tbd-bin to the new mozlinguas.eclass
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.52                 mail-client/thunderbird-bin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/ChangeLog?r1=1.51&r2=1.52

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog	31 Jan 2012 20:35:16 -0000	1.51
+++ ChangeLog	4 Feb 2012 18:35:28 -0000	1.52
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.51 2012/01/31 20:35:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.52 2012/02/04 18:35:28 nirbheek Exp $
+
+  04 Feb 2012; Nirbheek Chauhan <nirbheek@g.o>
+  thunderbird-bin-10.0.ebuild:
+  Port tbd-bin to the new mozlinguas.eclass
 
 *thunderbird-bin-10.0 (31 Jan 2012)
 



1.2                  mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild?r1=1.1&r2=1.2

Index: thunderbird-bin-10.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-bin-10.0.ebuild	31 Jan 2012 20:35:16 -0000	1.1
+++ thunderbird-bin-10.0.ebuild	4 Feb 2012 18:35:28 -0000	1.2
@@ -1,27 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild,v 1.1 2012/01/31 20:35:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild,v 1.2 2012/02/04 18:35:28 nirbheek Exp $
 
 EAPI="3"
 
-inherit eutils multilib mozextension pax-utils fdo-mime gnome2-utils nsplugins
-
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr
-fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm
-ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW)
-
-MY_PN="${PN/-bin}"
-MY_PV="${PV/_beta/b}"
-# This is a ugly hack, but what can ya do?
-MY_TEN_PV="${MY_PV/10.0/10.0-real}"
-MY_P="${MY_PN}-${MY_PV}"
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
+fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
+pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream fail...
+MY_TEN_PV="10.0-real"
+MOZ_LANGPACK_PREFIX="${MY_TEN_PV}/linux-i686/xpi/"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas
 
 DESCRIPTION="Thunderbird Mail Client"
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="
-	amd64? ( ${FTP_URI}/${MY_TEN_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${FTP_URI}/${MY_TEN_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MY_TEN_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MY_TEN_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip"
 
@@ -30,22 +37,6 @@
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+crashreporter"
 
-for X in "${LANGS[@]}" ; do
-	# en and en_US are handled internally
-	if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${FTP_URI}/${MY_TEN_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# Install all the specific locale xpis if there's no generic locale xpi
-	# Example: there's no pt.xpi, so install all pt-*.xpi
-	if ! has ${X%%-*} "${LANGS[@]}"; then
-		SRC_URI="${SRC_URI}
-			linguas_${X%%-*}? ( ${FTP_URI}/${MY_TEN_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
 DEPEND="app-arch/unzip"
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
@@ -54,56 +45,24 @@
 	>=media-libs/alsa-lib-1.0.16
 	crashreporter? ( net-misc/curl ) "
 
-S="${WORKDIR}/${MY_PN}"
-
-# TODO: Move all the linguas crap to an eclass
-linguas() {
-	# Generate the list of language packs called "linguas"
-	# This list is used to install the xpi language packs
-	local LINGUA
-	for LINGUA in ${LINGUAS}; do
-		if has ${LINGUA} en en_US; then
-			# For mozilla products, en and en_US are handled internally
-			continue
-		# If this language is supported by ${P},
-		elif has ${LINGUA} "${LANGS[@]//-/_}"; then
-			# Add the language to linguas, if it isn't already there
-			has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
-			continue
-		# For each short LINGUA that isn't in LANGS,
-		# add *all* long LANGS to the linguas list
-		elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
-			for LANG in "${LANGS[@]}"; do
-				if [[ ${LANG} == ${LINGUA}-* ]]; then
-					has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
-	done
-}
+S="${WORKDIR}/${MOZ_PN}"
 
 src_unpack() {
 	unpack ${A}
 
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_unpack "${P/-bin}-${X}.xpi"
-	done
+	# Unpack language packs
+	mozlinguas_src_unpack
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
 
 	# Install thunderbird in /opt
 	dodir ${MOZILLA_FIVE_HOME%/*}
 	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
 
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_install "${WORKDIR}/${P/-bin}-${X}"
-	done
+	# Install language packs
+	mozlinguas_src_install
 
 	# Create /usr/bin/thunderbird-bin
 	dodir /usr/bin/