--- perl-app.eclass	2007-06-29 09:58:47.000000000 +0200
+++ perl-app.eclass	2007-06-29 09:59:28.000000000 +0200
@@ -25,15 +25,14 @@
 
 	SRC_PREP="yes"
 	pwd
-	if [ "${PREFER_BUILDPL}" == "yes" ] && ( [ -f Build.PL ] || [ ${PN} == "module-build" ] ); then
+	if ( ( [ -f Build.PL ] && ( [ "${PREFER_BUILDPL}" == "yes" ] || [ ! -f Makefile.PL ] ) ) || [ ${PN} == "module-build" ] ); then
 		einfo "Using Module::Build"
 		echo "$pm_echovar" | perl Build.PL --installdirs=vendor --destdir=${D} --libdoc= || die "Unable to build! (are you using USE=\"build\"?)"
-	elif [ -f Makefile.PL ] && [ ! ${PN} == "module-build" ]; then
+	elif [ -f Makefile.PL ]; then
 		einfo "Using ExtUtils::MakeMaker"
 		echo "$pm_echovar" | perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
 		PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D} || die "Unable to build! (are you using USE=\"build\"?)"
-	fi
-	if [ ! -f Build.PL ] && [ ! -f Makefile.PL ]; then
+	else
 		einfo "No Make or Build file detected..."
 		return
 	fi
--- perl-module.eclass	2007-06-29 09:44:40.000000000 +0200
+++ perl-module.eclass	2007-06-29 09:57:48.000000000 +0200
@@ -116,15 +116,14 @@
 
 	SRC_PREP="yes"
 	find ${S} -type d -name "\.svn" -exec /bin/rm -rf {} \; 2>/dev/null 
-	if [ "${PREFER_BUILDPL}" == "yes" ] && ( [ -f Build.PL ] || [ ${PN} == "module-build" ] ); then
+	if ( ( [ -f Build.PL ] && ( [ "${PREFER_BUILDPL}" == "yes" ] || [ ! -f Makefile.PL ] ) ) || [ ${PN} == "module-build" ] ); then
 		einfo "Using Module::Build"
 		echo "$pm_echovar" | perl Build.PL --installdirs=vendor --destdir=${D} --libdoc= || die "Unable to build! (are you using USE=\"build\"?)"
-	elif [ -f Makefile.PL ] && [ ! ${PN} == "module-build" ]; then
+	elif [ -f Makefile.PL ]; then
 		einfo "Using ExtUtils::MakeMaker"
 		echo "$pm_echovar" | perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
 		PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D} || die "Unable to build! (are you using USE=\"build\"?)"
-	fi
-	if [ ! -f Build.PL ] && [ ! -f Makefile.PL ]; then
+	else
 		einfo "No Make or Build file detected..."
 		return
 	fi