--- /usr/portage/app-text/sablotron/sablotron-1.0.3.ebuild	2008-01-25 20:37:39.000000000 +0100
+++ /usr/portage/local/modified/app-text/sablotron/sablotron-1.0.3.ebuild	2008-11-11 16:09:20.000000000 +0100
@@ -22,26 +22,31 @@
 DEPEND="${RDEPEND}
 	doc? ( >=dev-perl/XML-Parser-2.3 )"
 
-PATCHES="${FILESDIR}/1.0.3-libsablot-expat.patch"
-
-src_compile() {
-	# Don't use --without-html-dir, since that ends up installing files under
-	# the /no directory
-	local myconf="--with-html-dir=/usr/share/doc/${PF}/html"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
+	epatch "${FILESDIR}"/${PV}-libsablot-expat.patch
+	
 	# Please make sure at least elibtoolize is run, else we get references
 	# to PORTAGE_TMPDIR in /usr/lib/libsablot.la ...
 	eautoreconf
+}
 
-	use perl && myconf="${myconf} --enable-perlconnect"
-
+src_compile() {
+	append-ldflags -shared-libgcc
+	econf \
+		$(use_enable perl perlconnect)
+	# Don't use --without-html-dir, since that ends up installing files under
+	# the /no directory
+		--with-html-dir=/usr/share/doc/${PF}/html
 	# rphillips, fixes bug #3876
 	# this is fixed for me with apache2, but keeping it in here
 	# for apache1 users and/or until some clever detection
 	# is added <obz@gentoo.org>
-	append-ldflags -lstdc++ -shared-libgcc
+		LIBS="-lstdc++" \
+		|| die "Configure failed"
 
-	econf ${myconf} || die "Configure failed"
 	emake || die "Make failed"
 }