--- /usr/portage/local/layman/voip/net-misc/asterisk/asterisk-1.4.22.1.ebuild	2009-03-09 12:46:46.000000000 +0100
+++ asterisk-1.4.23.2.ebuild	2009-03-11 11:05:15.000000000 +0100
@@ -197,6 +197,9 @@
 	#
 	epatch "${FILESDIR}"/1.4/${PN}-1.4.19-configure-gentoo.diff
 
+	# http://bugs.digium.com/view.php?id=13488
+	use misdn && epatch "${FILESDIR}"/1.4/${PN}-1.4.23.1-misdn.diff
+
 	# add custom device state function (func_devstate)
 	# http://asterisk.org/node/48360
 	# http://svncommunity.digium.com/svn/russell/func_devstate-1.4/README.txt
@@ -234,6 +237,9 @@
 	#
 	# start with configure
 	#
+	local dahdiorzap
+	use dahdi && dahdiorzap="$(use_with dahdi) $(use_with dahdi pri) $(use_with dahdi tonezone)"
+	use zaptel && dahdiorzap="$(use_with zaptel) $(use_with zaptel pri) $(use_with zaptel tonezone)"
 	econf \
 		--libdir="/usr/$(get_libdir)" \
 		--localstatedir="/var" \
@@ -261,12 +267,7 @@
 		$(use_with sqlite) \
 		$(use_with vorbis) \
 		$(use_with vorbis ogg) \
-		$(use_with zaptel) \
-		$(use_with zaptel pri) \
-		$(use_with zaptel tonezone) \
-		$(use_with dahdi) \
-		$(use_with dahdi pri) \
-		$(use_with dahdi tonezone) \
+		${dahdiorzap} \
 		$(use_with freetds tds) \
 		$(use_with postgres) || die "econf failed"