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

11 files changed, 68 insertions, 58 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 062b0b47e817..e61222791a6e 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.54 2005/05/15 21:46:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.55 2005/05/30 03:17:48 solar Exp $
+
+  29 May 2005; <solar@gentoo.org> asterisk-1.0.1.ebuild,
+  asterisk-1.0.2.ebuild, asterisk-1.0.3-r1.ebuild, asterisk-1.0.3.ebuild,
+  asterisk-1.0.5-r1.ebuild, asterisk-1.0.5.ebuild, asterisk-1.0.6.ebuild,
+  asterisk-1.0.7-r1.ebuild, asterisk-1.0.7.ebuild:
+  - update asterisk to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
 
   15 May 2005; Stefan Knoblich <stkn@gentoo.org>
   +files/1.0.0/asterisk-1.0.7-initgroups.diff, files/1.0.0/asterisk.confd.sec,
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e61171dff8b1..13a82f10d62a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,39 +1,51 @@
-MD5 af6efb0e1e4f80dc12bb5f1650c2d9a9 ChangeLog 10152
-MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4b0ab975fef56dad3891b692915c1df9 asterisk-1.0.7.ebuild 9695
+MD5 48aa0235a18b7329e3a9cb78259bf907 asterisk-1.0.2.ebuild 5556
+MD5 352b08882243bb0c915c6e3bdd203272 asterisk-1.0.5-r1.ebuild 7140
+MD5 c2ff7ca3b6577a06e7a25869ad50937e asterisk-1.0.6.ebuild 8589
+MD5 e897c1f5429427fc27541f803319e3ac asterisk-1.0.1.ebuild 5547
+MD5 72d523f05ad0002a0709f12b7409e5ad asterisk-1.0.3.ebuild 5812
+MD5 006fb912fb541d966cb79eb218f635eb asterisk-1.0.7-r1.ebuild 14590
+MD5 5b23a70adef00121289a7ddbb0adbf9b asterisk-1.0.3-r1.ebuild 5832
+MD5 8dc6baa891e6e6228e2a5da5de794c2c asterisk-1.0.5.ebuild 6281
 MD5 6201814863e121c6cae9a8209b0b9a27 asterisk-1.0.0.ebuild 3394
-MD5 c870e11d5cfc72f46a1290e769a491cc asterisk-1.0.1.ebuild 5576
-MD5 465f444622b40abb34bbb311b571ed24 asterisk-1.0.2.ebuild 5585
-MD5 0a9506b97103f05fdd15df48db9b3506 asterisk-1.0.3-r1.ebuild 5865
-MD5 9af7f719e9db949d2d7870e01cd6faa1 asterisk-1.0.3.ebuild 5845
-MD5 867bae5d74f56337feec21310c14ecca asterisk-1.0.5-r1.ebuild 7170
-MD5 c7b911a01a3bd822055a9ec010dfbae1 asterisk-1.0.5.ebuild 6314
+MD5 612a60a96c1b969138f7e8c997a0c300 ChangeLog 10501
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 1f0cf9681436a84a7be9a324e8375ef3 asterisk-1.0.6.ebuild 8622
-MD5 443437a5d15fe53ff78a0f93004a04f4 asterisk-1.0.7.ebuild 9725
-MD5 5a504aac8e179ef4d4d048ba2e1855c9 asterisk-1.0.7-r1.ebuild 14619
+MD5 b551ce4bb8eb4a03cb0e551c279ab02c asterisk-0.9.0.ebuild 3161
 MD5 0243bdde80a5b8433cf93c306458dfd8 files/digest-asterisk-0.9.0 67
 MD5 1bb1cf45f134eeae6adcc7dc17b6b5db files/digest-asterisk-1.0.0 141
 MD5 b97c969a083704e6f8c8c9b07d56db3b files/digest-asterisk-1.0.1 213
 MD5 5474694f8ec88752718f88d84e587468 files/digest-asterisk-1.0.2 213
 MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3 213
-MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3-r1 213
 MD5 08f910cf85384f1d08c01a439cb3634e files/digest-asterisk-1.0.5 213
-MD5 bfa11ecbbe1f5f9ecc73e121855fcf48 files/digest-asterisk-1.0.5-r1 213
 MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6 210
 MD5 d7a0d59fff2e991e7b091341893ec554 files/digest-asterisk-1.0.7 210
+MD5 4fa7ca8f47238dee3484dae5fb8f294c files/digest-asterisk-1.0.3-r1 213
+MD5 bfa11ecbbe1f5f9ecc73e121855fcf48 files/digest-asterisk-1.0.5-r1 213
 MD5 cafa114e45cae0cc2dd505d1deaa7184 files/digest-asterisk-1.0.7-r1 210
 MD5 5b7ebf09c4c7988bd16cadaaad08d8f6 files/0.9.0/asterisk.confd 290
 MD5 da4846c3843d6f94b278c687d3b2ad21 files/0.9.0/asterisk.rc6 465
+MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
 MD5 309907bd4419c2a5308d2bcaf119e590 files/1.0.0/asterisk.rc6.sec 1217
-MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
-MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
-MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
-MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
-MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
+MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
+MD5 78b01073a94beded6a86a2b45409df43 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 aa9927c6c7b3e4c761adb982ff94b540 files/1.0.0/asterisk.confd.sec 526
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
+MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
 MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
-MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
-MD5 aa9927c6c7b3e4c761adb982ff94b540 files/1.0.0/asterisk.confd.sec 526
-MD5 78b01073a94beded6a86a2b45409df43 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
+MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpqGCJ4WFLgrx1GWAQKWDwP+OJOwyip02I+yTcQstfaMQ2MLh+m37HQv
+sgOUWGMvNKhPBaSedpcNn61WUH+590lFuwepVKJh6HkKX5+WbTlgx/m8zTCoiJmx
+e+nDwXENTFrg1wJMfqfJxsq+3A5ii6NZMtU4LbrVZvPaGzCWw144cwLX2AuA2nq/
+hwVZPL20554=
+=6/9g
+-----END PGP SIGNATURE-----
diff --git a/net-misc/asterisk/asterisk-1.0.1.ebuild b/net-misc/asterisk/asterisk-1.0.1.ebuild
index aa2eb9d24117..c8ba2da9470a 100644
--- a/net-misc/asterisk/asterisk-1.0.1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.1.ebuild,v 1.4 2005/01/25 05:17:44 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.1.ebuild,v 1.5 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl"
 
 inherit eutils
 
@@ -27,7 +27,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-0.4 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.1 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.1 )"
@@ -101,7 +100,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/asterisk-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.2.ebuild b/net-misc/asterisk/asterisk-1.0.2.ebuild
index d7fe9ce56897..fcad044de972 100644
--- a/net-misc/asterisk/asterisk-1.0.2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.2.ebuild,v 1.4 2005/01/25 05:17:44 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.2.ebuild,v 1.5 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl"
 
 inherit eutils
 
@@ -27,7 +27,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-1.0.2 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.2 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.2 )"
@@ -101,7 +100,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/asterisk-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.3-r1.ebuild b/net-misc/asterisk/asterisk-1.0.3-r1.ebuild
index dd9d0407f52d..32944b93a14a 100644
--- a/net-misc/asterisk/asterisk-1.0.3-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.3-r1.ebuild,v 1.2 2005/01/31 18:47:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.3-r1.ebuild,v 1.3 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl"
 
 inherit eutils
 
@@ -28,7 +28,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-1.0.3 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.3 )"
@@ -109,7 +108,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/asterisk-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.3.ebuild b/net-misc/asterisk/asterisk-1.0.3.ebuild
index c0079642df0f..83113bffd957 100644
--- a/net-misc/asterisk/asterisk-1.0.3.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.3.ebuild,v 1.5 2005/01/31 18:47:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.3.ebuild,v 1.6 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl"
 
 inherit eutils
 
@@ -27,7 +27,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-1.0.3 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.3 )"
@@ -108,7 +107,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/asterisk-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.5-r1.ebuild b/net-misc/asterisk/asterisk-1.0.5-r1.ebuild
index 1df04d934deb..bf416d975484 100644
--- a/net-misc/asterisk/asterisk-1.0.5-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r1.ebuild,v 1.3 2005/02/21 21:07:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r1.ebuild,v 1.4 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl debug postgres vmdbmysql vmdbpostgres"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl debug postgres vmdbmysql vmdbpostgres"
 
 inherit eutils
 
@@ -31,7 +31,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-1.0.3 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.3 )
@@ -108,7 +107,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/${P}-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.5.ebuild b/net-misc/asterisk/asterisk-1.0.5.ebuild
index 878e6f223d53..640fb868d346 100644
--- a/net-misc/asterisk/asterisk-1.0.5.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5.ebuild,v 1.2 2005/01/31 19:19:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5.ebuild,v 1.3 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl debug"
+IUSE="alsa doc gtk mmx mysql pri zaptel resperl debug"
 
 inherit eutils
 
@@ -28,7 +28,6 @@ DEPEND="dev-libs/newt
 	pri? ( >=net-libs/libpri-1.0.3 )
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	resperl? ( dev-lang/perl
 		   >=net-misc/zaptel-1.0.3 )"
@@ -119,7 +118,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/asterisk-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.6.ebuild b/net-misc/asterisk/asterisk-1.0.6.ebuild
index d6be4cda7f6e..84864cd02724 100644
--- a/net-misc/asterisk/asterisk-1.0.6.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6.ebuild,v 1.3 2005/05/05 15:52:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6.ebuild,v 1.4 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc debug postgres vmdbmysql vmdbpostgres bri hardened speex"
+IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex"
 
 inherit eutils
 
@@ -33,7 +33,6 @@ DEPEND="dev-libs/newt
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
 	speex? ( media-libs/speex )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	postgres? ( dev-db/postgresql )
 	vmdbmysql? ( dev-db/mysql )
@@ -147,7 +146,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
index aa307deda547..7b87922f4bce 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.5 2005/05/15 21:46:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.6 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
 
 inherit eutils perl-module
 
@@ -34,7 +34,6 @@ DEPEND="dev-libs/newt
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
 	speex? ( media-libs/speex )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.7-r1 )
 	postgres? ( dev-db/postgresql )
 	vmdbmysql? ( dev-db/mysql )
@@ -195,7 +194,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
 	fi
diff --git a/net-misc/asterisk/asterisk-1.0.7.ebuild b/net-misc/asterisk/asterisk-1.0.7.ebuild
index 13af32633c84..36c9dae320f5 100644
--- a/net-misc/asterisk/asterisk-1.0.7.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7.ebuild,v 1.7 2005/05/10 11:53:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7.ebuild,v 1.8 2005/05/30 03:17:48 solar Exp $
 
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
+IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
 
 inherit eutils perl-module
 
@@ -33,7 +33,6 @@ DEPEND="dev-libs/newt
 	alsa? ( media-libs/alsa-lib )
 	mysql? ( dev-db/mysql )
 	speex? ( media-libs/speex )
-	uclibc? ( sys-libs/uclibc )
 	zaptel? ( >=net-misc/zaptel-1.0.3 )
 	postgres? ( dev-db/postgresql )
 	vmdbmysql? ( dev-db/mysql )
@@ -150,7 +149,7 @@ src_unpack() {
 	#
 	# uclibc patch
 	#
-	if use uclibc; then
+	if use elibc_uclibc; then
 		einfo "Patching asterisk for uclibc..."
 		epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
 	fi