- update courier to use libc expanded variable elibc_uclibc vs uclibc so USE=-* works

6 files changed, 30 insertions, 22 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index f3f033c95ee2..70460a14d9d2 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.54 2005/04/06 18:52:33 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.55 2005/05/30 03:06:26 solar Exp $
+
+  29 May 2005; <solar@gentoo.org> courier-0.48.1.ebuild,
+  courier-0.48.2.20050224.ebuild, courier-0.49.0.20050405.ebuild,
+  courier-0.49.0.ebuild:
+  - update courier to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
 
 *courier-0.49.0.20050405 (06 Apr 2005)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 6e4962401310..5e1ae8ab76e0 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5bfcb0b0986b991747d8eb0f09cc6fb5 courier-0.48.2.20050224.ebuild 10504
-MD5 a45a917f08f4bb667cd419c3179b234d courier-0.49.0.ebuild 10502
-MD5 449cf82fbc27d010b68b2609c5449c94 courier-0.48.1.ebuild 8513
-MD5 2223fedc5cfb7b611ee602b3f8662221 courier-0.49.0.20050405.ebuild 10511
-MD5 71f8709bf2e258e2b949c77de9df9e6e ChangeLog 19568
+MD5 34312418fdc6c5037592fa0cb0bccf8c courier-0.48.2.20050224.ebuild 10500
+MD5 113c9a1725a437cf9aea85f9fa662fda courier-0.49.0.ebuild 10498
+MD5 8de8434ea05e6a76656ba7f1d08fecb5 courier-0.48.1.ebuild 8510
+MD5 52b9e1c79d37a4168e98834570a20839 courier-0.49.0.20050405.ebuild 10507
+MD5 96fd8bf1d35c0d803412f6bbb74a322f ChangeLog 19804
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
@@ -20,9 +20,11 @@ MD5 9d570961b398a1a8e3724947c7205943 files/courier-init 5182
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCgJLeI1lqEGTUzyQRAmbyAKCUB7hJvTPqTRlwVZbQ2fXp4m/IPgCggvj0
-YYQVZfYe948eUsQRlN9jiCQ=
-=QL0n
+iQCVAwUBQpqDOp4WFLgrx1GWAQIRMgP/b/2xZ2Oh/mbQKzfJBJnQGchFuIAkfY7E
+ZAFrNkEBidVrZiSsFOxAul/rPoG6pxa9mbgf1Tp3tiC2ah06Z8bmVwzcurc1xr+e
++9hRsazpv9Ui7D9Zr9OSNWtjiYC36Pw18+lCyXIiyz8dOHGGZHt5p6d1PJhWPNf/
+lVbHEPxPKbE=
+=s7iJ
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.48.1.ebuild b/mail-mta/courier/courier-0.48.1.ebuild
index dca9a2953adb..38b8a69b655f 100644
--- a/mail-mta/courier/courier-0.48.1.ebuild
+++ b/mail-mta/courier/courier-0.48.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.1.ebuild,v 1.5 2005/03/03 17:15:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.1.ebuild,v 1.6 2005/05/30 03:06:26 solar Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="x86 alpha amd64 hppa ia64 ~mips ppc sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper"
 
 PROVIDE="virtual/mta
 	 virtual/mda
@@ -47,7 +47,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 }
 
 src_compile() {
diff --git a/mail-mta/courier/courier-0.48.2.20050224.ebuild b/mail-mta/courier/courier-0.48.2.20050224.ebuild
index ad5d519ae202..96341ffacb8d 100644
--- a/mail-mta/courier/courier-0.48.2.20050224.ebuild
+++ b/mail-mta/courier/courier-0.48.2.20050224.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.4 2005/03/21 11:14:15 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.48.2.20050224.ebuild,v 1.5 2005/05/30 03:06:26 solar Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper fam"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
 
 PROVIDE="virtual/mta
 	 virtual/mda
@@ -56,7 +56,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 }
 
 src_compile() {
diff --git a/mail-mta/courier/courier-0.49.0.20050405.ebuild b/mail-mta/courier/courier-0.49.0.20050405.ebuild
index cd4d5731c8bb..1833123cfc94 100644
--- a/mail-mta/courier/courier-0.49.0.20050405.ebuild
+++ b/mail-mta/courier/courier-0.49.0.20050405.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.20050405.ebuild,v 1.1 2005/04/06 18:52:33 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.20050405.ebuild,v 1.2 2005/05/30 03:06:26 solar Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper fam"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
 
 PROVIDE="virtual/mta
 	 virtual/mda
@@ -56,7 +56,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 }
 
 src_compile() {
diff --git a/mail-mta/courier/courier-0.49.0.ebuild b/mail-mta/courier/courier-0.49.0.ebuild
index bd61d9ef8479..28925289f5b7 100644
--- a/mail-mta/courier/courier-0.49.0.ebuild
+++ b/mail-mta/courier/courier-0.49.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.ebuild,v 1.2 2005/03/21 11:14:15 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.49.0.ebuild,v 1.3 2005/05/30 03:06:26 solar Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper fam"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
 
 PROVIDE="virtual/mta
 	 virtual/mda
@@ -56,7 +56,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 }
 
 src_compile() {