--- ppp-2.4.5-r3.ebuild.orig	2012-08-10 10:12:54.000000000 +0600
+++ ppp-2.4.5-r3.ebuild	2012-08-12 13:06:18.004899422 +0600
@@ -31,6 +31,16 @@
 
 	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
 	use dhcp || EPATCH_EXCLUDE+=" 8?_all_dhcp-*"
+
+	if use dhcp ; then
+		# copy the ppp-dhcp plugin files
+		einfo "Adding ppp-dhcp plugin files"
+		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+		sed -i \
+			-e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \
+			pppd/plugins/Makefile.linux || die
+	fi
+
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 
 	if use atm ; then
@@ -56,15 +66,6 @@
 	einfo "Enabling CBCP"
 	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
 
-	if use dhcp ; then
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files"
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-		sed -i \
-			-e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \
-			pppd/plugins/Makefile.linux || die
-	fi
-
 	# Set correct libdir
 	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
 		pppd/{pathnames.h,pppd.8}