Add support for bootstrapping so the live git ebuild works. bug #377279. Change based on patches from hasufell <julian.ospald@googlemail.com>

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 46 insertions, 7 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 8db9dd53780c..705a1d7493e5 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.163 2012/03/05 14:46:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.164 2012/03/05 23:44:38 cardoe Exp $
+
+  05 Mar 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.10-r4.ebuild,
+  libvirt-9999.ebuild:
+  Add support for bootstrapping so the live git ebuild works. bug #377279.
+  Change based on patches from hasufell <julian.ospald@googlemail.com>
 
 *libvirt-0.9.10-r4 (05 Mar 2012)
 
   05 Mar 2012; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.10-r3.ebuild,
   +libvirt-0.9.10-r4.ebuild, libvirt-9999.ebuild:
-  Fix filename of sysctl config file so OpenRC respects it Identified by BT
+  Fix filename of sysctl config file so OpenRC respects it. Identified by BT
   <amak79@gmail.com>. bug #406729
 
   01 Mar 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.10-r3.ebuild,
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d9b62b52f433..0fadd82b6201 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,9 +6,9 @@ DIST libvirt-0.9.10-bp-1.tar.bz2 4359 RMD160 1b064c56007001f509cd0e940ec337d6281
 DIST libvirt-0.9.10.tar.gz 19085438 RMD160 8f103b176fc7b943a88cf7196709865edc5db5e8 SHA1 cf32d6bea295cb30461901d987f049c9547ff1e8 SHA256 5b81d9f054ee4b395b0ab4f59845d082baaa6d6c2a038c966309156dde16e11d
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
-EBUILD libvirt-0.9.10-r4.ebuild 8181 RMD160 162885aa5c8ccf76c6ad37f086ed7a3c6c766a08 SHA1 c966ff34af5d51f4b1d4280b8e7329cd5f4e103f SHA256 e3b36fb1318706f9cfcd6b49805d2bca16c862d68f9bc53fe23044dbf5ab52e1
+EBUILD libvirt-0.9.10-r4.ebuild 8676 RMD160 0c86f81e65d9ce1a83de9286ab63aa4ff89e074c SHA1 51b4271130e693cf5ffb46e537a37089fed23287 SHA256 7a704f87e4cc0bc18cdcdb70b1470c35dd5dc3d232f69dc51047a9ca8851e039
 EBUILD libvirt-0.9.6.ebuild 7907 RMD160 bf6ee27bc31c83544d172c639b05b59b3279c7dd SHA1 8ab9af963271485e43a656c2286cc431a3a15d09 SHA256 79b46ae24402a19f334fb6bdc02fab634f43c254dff0331c40aecc5b888ca04b
 EBUILD libvirt-0.9.8.ebuild 8148 RMD160 3767bd9427a9e104017b30d8a7d6654f1181592e SHA1 58e27d3fda8a63e5856838e475efc46d21b9c54f SHA256 0049122ad13fbf6d33e41d669029c12be2073ed6d198ed43a24ad732b5aceb19
-EBUILD libvirt-9999.ebuild 8177 RMD160 93c00ed4be93aecf06d07f0d97d3840fd0c09c25 SHA1 b3c674d87640615889da1f89bcce59a360c6ce7e SHA256 d285f6abb78105cf972abf12e0452c7ee518794b1d9d00bb932e98e0d7a66596
-MISC ChangeLog 33566 RMD160 3d22f6ab2364c500ce02fe1d606d739dedad3ca0 SHA1 633b284481618f9b8602002ddcf8f146cf46bef0 SHA256 2ee2a64fbfc76aff1eb22a10d3dae5cdb7fdf9fa82d5f163b92d2b6ebc4f12a4
+EBUILD libvirt-9999.ebuild 8672 RMD160 9b516fa97729597ca98e592a047c3be8de326773 SHA1 071538b635477ec76e7c22c904fd095787b745d8 SHA256 a89c69a2107c07036fe763f80a0873e19cd744f6310412e1e5e99dab9df88562
+MISC ChangeLog 33813 RMD160 12dcd8a0446e5e04bab3d7710cb9ee03a0d3358c SHA1 11454798cd306dd7346bbae737e1f2b175696252 SHA256 b2ee7e7b77d2e141deb37ead309048257bb2a2f24554869587a3678a34a72144
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild b/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild
index 86c682b80905..7d0f3dfd5c26 100644
--- a/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild,v 1.1 2012/03/05 14:46:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r4.ebuild,v 1.2 2012/03/05 23:44:38 cardoe Exp $
 
 BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -100,6 +100,17 @@ src_prepare() {
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
 
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
 }
 
@@ -193,6 +204,12 @@ src_configure() {
 		--docdir=/usr/share/doc/${PF} \
 		--with-remote \
 		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
 }
 
 src_test() {
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 61cc42c46fa2..69e4d5bbd277 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.24 2012/03/05 14:46:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.25 2012/03/05 23:44:38 cardoe Exp $
 
 BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -100,6 +100,17 @@ src_prepare() {
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
 
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
 	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
 }
 
@@ -193,6 +204,12 @@ src_configure() {
 		--docdir=/usr/share/doc/${PF} \
 		--with-remote \
 		--localstatedir=/var
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
 }
 
 src_test() {