--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- libvirt-9999.ebuild
+++ libvirt-9999.ebuild
@@ -100,6 +100,15 @@ 
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
 
+	./bootstrap || die "bootstrap failed"
+	(
+		git submodule status | sed 's/^[ +-]//;s/ .*//'
+		git hash-object bootstrap.conf
+	) >.git-module-status
+	# this has already been done by bootstrap but we're 
+	#required to redo it to remove maintainer mode
+	eautoreconf
+
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
 }
 
@@ -193,6 +202,9 @@ 
 		--docdir=/usr/share/doc/${PF} \
 		--with-remote \
 		--localstatedir=/var
+
+	# HACK, restore gnulib's config.sub and config.guess
+	(cd .gnulib && git reset --hard >/dev/null)
 }
 
 src_test() {