--- swish-e-2.4.4.ebuild	2007-07-13 18:36:24.000000000 +1200
+++ swish-e-2.4.4.ebuild	2009-03-08 11:49:19.346373681 +1300
@@ -32,11 +32,42 @@
 		epause 10
 	fi
 	unpack ${A}
+	cd ${S}
+	if use perl ; then 
+		einfo 'Applying Perl Patches'; 
+		#cp "${FILESDIR}/Makefile.PL" "${S}/perl/Makefile.PL"
+		epatch ${FILESDIR}/perl-makefile-${PV}.patch
+		einfo 'Done'
+	fi
 }
-src_compile() {
+
+# Designed for EAPI 2 but not bumping EAPI 2 till somebody thinks its a good
+# idea and it works
+fake_configure() {
+	cd "${S}";
 	econf || die "configuration failed"
+	if use perl; then
+		einfo "Configuring for Perl"
+		cd "${S}/perl"
+		chmod u+x "${S}/swish-config"
+		myconf="SWISHBINDIR=${S} SWISHIGNOREVER SWISHSKIPTEST"
+		perl-module_src_configure
+		einfo 'Done'
+	fi
+}
+src_compile() {
+	fake_configure
+	cd "${S}"
 	# XXX: is this -j1 really needed ?
 	emake -j1 || die "emake failed"
+	if use perl ; then
+		einfo "Compiling for Perl"
+		cd ${S}/perl
+		chmod u+x "${S}/swish-config"
+		myconf="SWISHBINDIR=${S} SWISHIGNOREVER SWISHSKIPTEST"
+		perl-module_src_compile
+		einfo 'Done'
+	fi
 }
 
 src_install() {
@@ -48,14 +79,12 @@
 		dodir /usr/share/doc/${PF}
 		cp -r html conf "${D}"/usr/share/doc/${PF} || die "cp failed"
 	fi
-
 	if use perl ; then
-		epatch ${FILESDIR}/perl-makefile.patch
-		cd ${S}/perl
-		myconf="SWISHBINDIR=${D}/usr/bin SWISHIGNOREVER SWISHSKIPTEST"
-		perl-module_src_compile
+		einfo "Installing for Perl"
+		myconf="SWISHBINDIR=${S} SWISHIGNOREVER SWISHSKIPTEST"
 		cd ${S}/perl
 		perl-module_src_install
+		eend
 	fi
 }