Added nls support. Closes bug #87014.

(Portage version: 2.1_pre7-r3)

6 files changed, 45 insertions, 17 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index c9f3b90ce66e..439c197b16a5 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.45 2006/03/21 23:22:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.46 2006/04/01 05:12:42 eradicator Exp $
+
+*squirrelmail-1.5.1-r1 (01 Apr 2006)
+*squirrelmail-1.4.6-r2 (01 Apr 2006)
+
+  01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  -squirrelmail-1.4.6-r1.ebuild, +squirrelmail-1.4.6-r2.ebuild,
+  -squirrelmail-1.5.1.ebuild, +squirrelmail-1.5.1-r1.ebuild:
+  Added nls support.  Closes bug #87014.
 
 *squirrelmail-1.5.1 (21 Mar 2006)
 
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 4c7edf8ec5c8..8433d4c7d962 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6c7d5b310fbe05fbee7dbb7387c0796b ChangeLog 14890
 RMD160 8717964f31d2f89b8f06d2295a2d6ad83427a993 ChangeLog 14890
 SHA256 1ded29775c3e7be6efa6febb6c0d3d58b9e7e2d14efb5c7aa6fde1c40e611172 ChangeLog 14890
@@ -10,9 +7,15 @@ SHA256 61df34c17f9a5ef184d3c7edb52263986fa60591d174f6f983d359a103d38146 files/di
 MD5 23d4caf82b877616e067005d8f409deb files/digest-squirrelmail-1.4.6-r1 2334
 RMD160 a0740d0c8093a63f4564e5bd376bf1a749868c52 files/digest-squirrelmail-1.4.6-r1 2334
 SHA256 975b1c7008b98f057189baf43a0c948838d2f3d1c8cbc05433a21342d6e94882 files/digest-squirrelmail-1.4.6-r1 2334
+MD5 0e654bbe795ff3cd52fbc15189be35a3 files/digest-squirrelmail-1.4.6-r2 2620
+RMD160 1ba06f121431ed6f72dbd4badf409048362110d5 files/digest-squirrelmail-1.4.6-r2 2620
+SHA256 4fc42d52adfcd59d91b6f343f8b01efd81a78a0ed22c68b41ae25efaa02c65e0 files/digest-squirrelmail-1.4.6-r2 2620
 MD5 f1f415d9770485e3ef524e39d02d0fac files/digest-squirrelmail-1.5.1 2334
 RMD160 a4b0a7b6ddf751e1a3ad5bb7698f93a4ba1582bc files/digest-squirrelmail-1.5.1 2334
 SHA256 634772987b4c568d778948331c06a36eae8ead4b38f71041fbe261cea60664c6 files/digest-squirrelmail-1.5.1 2334
+MD5 10158f243a971cc8a428d8cf28277d6e files/digest-squirrelmail-1.5.1-r1 2620
+RMD160 9554715d0ebf965895727b5a18cb57b092e65376 files/digest-squirrelmail-1.5.1-r1 2620
+SHA256 cffb974aa68e0f7c611ea500a3664b6c781dc3682c645821f0b987a06fbcc20d files/digest-squirrelmail-1.5.1-r1 2620
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
 RMD160 a7b5fe1aba60530c193919ecb6b213cdd57dddf8 files/ldapuserdata-0.4-gentoo.patch 709
 SHA256 bff9cf8e7518df983b03b3f4e7f10fcf31fb75f6d73afb21c8923f2a8312b4a3 files/ldapuserdata-0.4-gentoo.patch 709
@@ -28,16 +31,15 @@ SHA256 0c209e720f028e6e9b098d29eab884753668aea3f47b56e44f3271ae60750680 metadata
 MD5 bb7322b9a4d2d34325e611beb529a8ae squirrelmail-1.4.6-r1.ebuild 5478
 RMD160 2e770294d6413e5d89d436e78faa6e94007f6d2b squirrelmail-1.4.6-r1.ebuild 5478
 SHA256 3d2afd40e00dd8ce4d73f837d55d3995ae761d98f8d686452002474992aa74d8 squirrelmail-1.4.6-r1.ebuild 5478
+MD5 088b9106066323ec26cd9ea32a56333c squirrelmail-1.4.6-r2.ebuild 5655
+RMD160 6c1201681cd697c9e9470478ecc9c6db765799dc squirrelmail-1.4.6-r2.ebuild 5655
+SHA256 a4b102a79c9da4b93fc7f6c9496128b592301f4a5c901e15fee9c31de5e8a7b2 squirrelmail-1.4.6-r2.ebuild 5655
 MD5 588992d86d51214c78b2734b356fa800 squirrelmail-1.4.6.ebuild 5473
 RMD160 314f04a3e8627fa7f40366a34757e9052a16d878 squirrelmail-1.4.6.ebuild 5473
 SHA256 5c8739ce5b0f1fe2dde15a6ef961c6f06375d387b60c22838d5fee036747f9eb squirrelmail-1.4.6.ebuild 5473
+MD5 764d5b64d04b753fcab7419f0f581b9a squirrelmail-1.5.1-r1.ebuild 4848
+RMD160 5c8f290a38ccc36ff7be55a03cc58583c0979dd6 squirrelmail-1.5.1-r1.ebuild 4848
+SHA256 e0df5defe1910e3735d78581dfe5c10a401318aab9b1d6e31dfae4b654e15e43 squirrelmail-1.5.1-r1.ebuild 4848
 MD5 5dc56e46a4b443e1f499604164aafb1c squirrelmail-1.5.1.ebuild 4671
 RMD160 e6cd13bc2f0a3da01f0fd5fed7fb40fca2316c2f squirrelmail-1.5.1.ebuild 4671
 SHA256 b66e126f725315db053376db241c4335cab6565a2932b7d15ca3cc219d9185cc squirrelmail-1.5.1.ebuild 4671
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIIrXOpjtAl+gMRURAnzOAKC9A1KHeYbtKqByTbESAJBKF3eQLgCg2Oce
-s4yA6hGu2ASyDu+Q8VyjKds=
-=rFDs
------END PGP SIGNATURE-----
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r2
index d7a4c74c40a1..8b65672f432a 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r1
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.4.6-r2
@@ -1,6 +1,9 @@
 MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
 RMD160 6847934c59ae73119a796c6fef251de26a2ea531 admin_add.0.1-1.4.0.tar.gz 2388
 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc admin_add.0.1-1.4.0.tar.gz 2388
+MD5 29dfec2e0f71fba368a89c36c51881c2 all_locales-1.4.6-20060221.tar.bz2 2448102
+RMD160 c108485b090ffc8ea96b1384c9cf588adade7ed2 all_locales-1.4.6-20060221.tar.bz2 2448102
+SHA256 e29b017deb84e7a3656ed846b2387911e4c7275e88fd3d6761528dbaa7510ac4 all_locales-1.4.6-20060221.tar.bz2 2448102
 MD5 4766f5f6706e086d5c9370bef9e7629f amavisnewsql-0.8.0-1.4.tar.gz 101008
 RMD160 72b796565f128354c51e8a04384e49621371cf16 amavisnewsql-0.8.0-1.4.tar.gz 101008
 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisnewsql-0.8.0-1.4.tar.gz 101008
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1 b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r1
index 29faa4f2071f..e4786932440c 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r1
@@ -1,6 +1,9 @@
 MD5 c321d0f7efa624f6bc3f3a4d1bf08782 admin_add.0.1-1.4.0.tar.gz 2388
 RMD160 6847934c59ae73119a796c6fef251de26a2ea531 admin_add.0.1-1.4.0.tar.gz 2388
 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc admin_add.0.1-1.4.0.tar.gz 2388
+MD5 ea311416ba9a96352a0728f5a7611102 all_locales-1.5.1-20060219.tar.bz2 2616039
+RMD160 681ea1bcbfc5ae57ced11e33cb19731cefa2dd00 all_locales-1.5.1-20060219.tar.bz2 2616039
+SHA256 f27d7f1506607c8cf2651bb4384f5a840eb71f0d38cfae4d77b292c56e49d0a3 all_locales-1.5.1-20060219.tar.bz2 2616039
 MD5 4766f5f6706e086d5c9370bef9e7629f amavisnewsql-0.8.0-1.4.tar.gz 101008
 RMD160 72b796565f128354c51e8a04384e49621371cf16 amavisnewsql-0.8.0-1.4.tar.gz 101008
 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c amavisnewsql-0.8.0-1.4.tar.gz 101008
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.6-r2.ebuild
index 3ce76ca7ee63..807e434c3448 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.6-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.6-r1.ebuild,v 1.3 2006/03/21 23:22:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.6-r2.ebuild,v 1.1 2006/04/01 05:12:42 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres"
+IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -17,6 +17,7 @@ GPG_VER=2.0.1-1.4.2
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.2-1.2.8
 SHOWSSL_VER=2.1-1.2.8
+LOCALES_VER=1.4.6-20060221
 
 MY_P=${P/_rc/-RC}
 S="${WORKDIR}/${MY_P}"
@@ -30,7 +31,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
 	crypt? ( ${PLUGINS_LOC}/gpg.${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )"
+	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
+	nls? (mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2)"
 
 HOMEPAGE="http://www.squirrelmail.org/"
 
@@ -83,6 +85,10 @@ src_unpack() {
 		mv secure_login/config.php.sample secure_login/config.php &&
 		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
 		mv show_ssl_link/config.php.sample show_ssl_link/config.php
+
+	use nls &&
+		cd ${S} &&
+		unpack all_locales-${PV}-${LOCALES_VER}.tar.bz2
 }
 
 src_compile() {
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild
index d0d80a6ad543..fdc047578b36 100644
--- a/mail-client/squirrelmail/squirrelmail-1.5.1.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1.ebuild,v 1.1 2006/03/21 23:22:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r1.ebuild,v 1.1 2006/04/01 05:12:42 eradicator Exp $
 
-IUSE="crypt ldap spell ssl filter mysql postgres"
+IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
 inherit webapp eutils
 
@@ -17,6 +17,7 @@ GPG_VER=2.0.1-1.4.2
 LDAP_USERDATA_VER=0.4
 SECURELOGIN_VER=1.2-1.2.8
 SHOWSSL_VER=2.1-1.2.8
+LOCALES_VER=1.5.1-20060219
 
 MY_P=${P/_rc/-RC}
 S="${WORKDIR}/${MY_P}"
@@ -30,7 +31,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
 	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
 	crypt? ( ${PLUGINS_LOC}/gpg.${GPG_VER}.tar.gz )
-	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )"
+	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
+	nls? (mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2)"
 
 HOMEPAGE="http://www.squirrelmail.org/"
 
@@ -96,6 +98,10 @@ src_unpack() {
 		mv secure_login/config.php.sample secure_login/config.php &&
 		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
 		mv show_ssl_link/config.php.sample show_ssl_link/config.php
+
+	use nls &&
+		cd ${S} &&
+		unpack all_locales-${PV}-${LOCALES_VER}.tar.bz2
 }
 
 src_compile() {