Drop nls USE flag, --disable-unicode is no longer supported, bug #326335

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 13 insertions, 12 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 379308bf91f0..06c08b9dcaa8 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.185 2010/06/28 22:02:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.186 2010/07/01 11:51:11 voyageur Exp $
+
+  01 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  courier-imap-4.8.0.ebuild:
+  Drop nls USE flag, --disable-unicode is no longer supported, bug #326335
 
 *courier-imap-4.8.0 (28 Jun 2010)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 76a7163a3bb1..ea6af5c740aa 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -23,6 +23,6 @@ DIST courier-imap-4.8.0.tar.bz2 3362734 RMD160 cfc0beec6893c155cf9712d9200023201
 EBUILD courier-imap-4.0.6-r3.ebuild 8500 RMD160 be84f60cb53d29016343bdba58ef759a424ae5c3 SHA1 c502b351f11d0fa940dc8af62440ecbd4edc8371 SHA256 2f6173ef13c662b062ad93129da76224ba01c56a0def4e1f998cca98e195a351
 EBUILD courier-imap-4.5.0.ebuild 8225 RMD160 e651272ff98a5a5b9806f6fb2cf613ac04a0afd3 SHA1 705983eb092dc9aa968131296c2db2ef932a5167 SHA256 b34ed53609dead813ecf365fbb60c046c072a8a87ca15a352ab7ea515e4caf61
 EBUILD courier-imap-4.6.0.ebuild 7684 RMD160 1cf83bb411c6700a71a863eaa6189006404bcec8 SHA1 c62703c86477e3b41b2922607108b395ae2604ea SHA256 d610242d6f9a7a7c98eec25350f7c7ab32cea2d9d77038bfa9ff58c2546b946b
-EBUILD courier-imap-4.8.0.ebuild 7685 RMD160 10603a9e3bf475a0724026dae3a202b61f7da03c SHA1 99c951d1435dedf4db8af27c299c8024e35a2038 SHA256 d1e31ff9472da081211294c79b211aeb22831f8df63a2e812b9824af14a8dc0e
-MISC ChangeLog 37381 RMD160 bf3d2df71b840187776816a7238fd1a2970e3dc2 SHA1 6da1f6e9acdde8a2bdcac46bdeaa603b796ccfff SHA256 f0520d0a74d5bdb19625ce216a968cfe93751b6e54f161b3084fc524d09e1e7b
+EBUILD courier-imap-4.8.0.ebuild 7566 RMD160 a5f3ec9b59fb1ea9a426e52f10df20c22e79fa26 SHA1 54793ca45cdb1a73dd2e517787e3ab9d201cebd0 SHA256 a5e4c1f081e05db2906e75de9b26b263fab9d1fd220514f40344f0248e4882d4
+MISC ChangeLog 37541 RMD160 fe2fda7bfc99d8b2cfcda4b0e621e2e30f1f1e65 SHA1 9a8e949b476465b49b01b72a27e2f9c2831f4225 SHA256 437beaa873b685bcf4f5d33f79243f58b3703c2cd7bf42cf5879919f2e7c14dc
 MISC metadata.xml 495 RMD160 a08ec4892b1931702f94b78f75841d4a6d0989ab SHA1 6fee69c5c0cc8fe6092d12e0028ca43739d94040 SHA256 009ce86710a6c7acebacfd6338e68e3eb73e17f9be05042aadad0a469a8a3da5
diff --git a/net-mail/courier-imap/courier-imap-4.8.0.ebuild b/net-mail/courier-imap/courier-imap-4.8.0.ebuild
index fc9112dee6dc..9d6874dbaa3d 100644
--- a/net-mail/courier-imap/courier-imap-4.8.0.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0.ebuild,v 1.1 2010/06/28 22:02:23 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0.ebuild,v 1.2 2010/07/01 11:51:11 voyageur Exp $
 
 EAPI=2
 inherit autotools eutils multilib libtool
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls trashquota"
+IUSE="berkdb debug fam gdbm ipv6 selinux gnutls trashquota"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
 		!gnutls? ( >=dev-libs/openssl-0.9.6 )
@@ -77,19 +77,16 @@ src_configure() {
 		myconf="${myconf} --with-db=db"
 	fi
 
-	# The default character set is ISO-8859-1/US-ASCII.
-	# USE 'nls' will enable all available character sets.
+	# Disabling unicode is no longer supported
+	# By default all available character sets are included
 	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
 	# to include only specified translation tables.
-	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+	if [[ -z "${ENABLE_UNICODE}" ]] ; then
 		einfo "ENABLE_UNICODE is not set, building with all available character sets"
 		myconf="${myconf} --enable-unicode"
-	elif use nls ; then
+	else
 		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
 		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
-	else
-		einfo "Disabling unicode support"
-		myconf="${myconf} --disable-unicode"
 	fi
 
 	if use trashquota ; then