[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     688327b0ccfd2e1c8b08aba1cf532d377cf19c43
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 10:14:33 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 10:14:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=688327b0

seamonkey: improved 2.2b1 ebuild a bit

---
 www-client/seamonkey/Manifest                   |    2 +-
 www-client/seamonkey/seamonkey-2.2_beta1.ebuild |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 4369a03..e53f151 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -71,4 +71,4 @@ DIST seamonkey-2.2b1-sk.xpi 840212 RMD160 c0229531c487e489c909c00ffaf05dfd1c6306
 DIST seamonkey-2.2b1.source.tar.bz2 87668841 RMD160 52f18e3f4445244eeeec2b5cbb2049a2552c3c8d SHA1 b17568d5e045852690938129933ef956c0fdfea7 SHA256 c5f655e2d916149513b613f8d522e4a0e9cff2a9a2549c93c8ade10a3e0b6d84
 EBUILD seamonkey-2.1.ebuild 9195 RMD160 6317e5c4791ca14097db26bcec30533916411fb2 SHA1 16fe0a63f4a6840b5133ce701169f644672e5779 SHA256 5adf1c4dc32ecd36c3be025715d49bc32c70b85b44cb6caf0465a231c28bbc90
 EBUILD seamonkey-2.1_rc2_pre1.ebuild 9310 RMD160 10f4f54ba31e90286932cabd8a30e2b7ec945a9e SHA1 3d6eb075f73f9a3424ff66a7d076595ce88ba86a SHA256 3bcbd48eff61456be7c3c59d64528c642c1abdea3d82f74d47395c5507016c23
-EBUILD seamonkey-2.2_beta1.ebuild 9164 RMD160 85a36b62b3f11e42d9f1b861a37915c94076de99 SHA1 17c9d72c88d2a3cb3d5b7d900b7a973b75fa8f4e SHA256 cd8203fd8e6b1e7805f4e7412b6c54c8334dd8c7c0cafbb0910bb7b4f60721be
+EBUILD seamonkey-2.2_beta1.ebuild 9184 RMD160 b3a0676f8673023447b4c73060a2e9f76f031b91 SHA1 1a7ca96dd814314c7de75a995e15a139044f91af SHA256 9d70acc23dc895f47618b32ed2cf297e0eb3ae42d1917d0e2c923cd04b23f663

diff --git a/www-client/seamonkey/seamonkey-2.2_beta1.ebuild b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
index 4d3dbf8..aca6e63 100644
--- a/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.2_beta1.ebuild
@@ -25,6 +25,7 @@ if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
 
 	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
+	LANG_URI="${REL_URI}/langpack"
 	#KEYWORDS=""
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	#HAS_LANGS="false"
@@ -32,6 +33,7 @@ else
 	# This is where arch teams should change the KEYWORDS.
 
 	REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
+	LANG_URI="${REL_URI}/langpack"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	[[ ${PV} == *alpha* ]] && HAS_LANGS="false"
 fi
@@ -51,14 +53,14 @@ if ${HAS_LANGS} ; then
 	for X in ${LANGS} ; do
 		if [ "${X}" != "en" ] ; then
 			SRC_URI="${SRC_URI}
-				linguas_${X/-/_}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+				linguas_${X/-/_}? ( ${LANG_URI}/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
 		fi
 		IUSE="${IUSE} linguas_${X/-/_}"
 		# english is handled internally
 		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
 			#if [ "${X}" != "en-US" ]; then
 				SRC_URI="${SRC_URI}
-					linguas_${X%%-*}? ( ${REL_URI/build?/build1}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
+					linguas_${X%%-*}? ( ${LANG_URI}/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )"
 			#fi
 			IUSE="${IUSE} linguas_${X%%-*}"
 		fi