[app-emulation/xen-tools] Prevent downloading during compile, fixes bug #366125;...

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 114aee1dbed415edf1c6c370ef77644b8264d86d..18f7c637e39fadc24c9ad6d04102fbf163de127d 100644 (file)
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.84 2011/09/11 21:27:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.85 2011/09/12 18:59:01 alexxy Exp $
+
+*xen-tools-4.1.1-r4 (12 Sep 2011)
+
+  12 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-4.1.1-r3.ebuild,
+  +xen-tools-4.1.1-r4.ebuild:
+  Prevent downloading during compile, fixes bug #366125; Thanks to Ian Delaney
+  aka idella4
 
   11 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r3.ebuild,
   xen-tools-9999.ebuild:

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 13424de33691eafa0faa2432b72f7f4fb851209f..454771d16432aef3814873fd34e48c928ca1b577 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -16,27 +16,28 @@ AUX xendomains.initd-r1 2921 RMD160 dd45bbc63a2c497990e193eb80b24b47226a8da2 SHA
 AUX xendomains.initd-r2 2933 RMD160 31d35c58d0286a34bebd636e85a9368054b8f6c0 SHA1 5e9cbdb5f2b1770bf30ba99ca7c67dbf38b78e84 SHA256 da69c146e5213df5376bd9b2758d9d5957c802e5513c6ea510e604d00f1d9e40
 AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831
 AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8
+DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 SHA1 da052c8de5f3485fe0253c19cf52ed6d72528485 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.1-r3.ebuild 9303 RMD160 2d8a3d6492f6710745491eb368218924c6f86d22 SHA1 0e764394b5d6406a51bdd735095d36f71b6ed8f0 SHA256 c227238067d4726af4474bdde208bb90ba3951e7a6f4013254a2443c2e71fda0
-EBUILD xen-tools-9999.ebuild 9299 RMD160 0e8a81acf118f72b7533e23af9c736862697d0d3 SHA1 87c2f914c86fd54e3dc2af5a68ab4fd543010f7d SHA256 dce58d077d5b5e14a06b6471490a2b709ceb05862c5551f0ce4a4fa5e9288be1
-MISC ChangeLog 20592 RMD160 44a913bcf2caf641789c27792b2cea29878e021f SHA1 00fa36deaa306e9c8779890a61b12de2f703ffc9 SHA256 295918059ff1d3d25b85dee56e320adea56b2b1395e9039d5d71a789be3333a9
+EBUILD xen-tools-4.1.1-r4.ebuild 9686 RMD160 ded666cf94ad6ff2b74e921be18a269d7b7a01dd SHA1 057c81aa08af26125730d7b0082ee7b43060bece SHA256 95055f944985ba590fc8331949604fb3e4d6d0da0f6645c3829a3ce7f4e59551
+EBUILD xen-tools-9999.ebuild 9682 RMD160 2f60aa64bb720767cee6b7a88a421613f92dcf02 SHA1 69a5487f75dd757d5da96bb2339c38819fe6d4d6 SHA256 20770f7c8a02ea141be8a8772624e6dcf8266dbee477b31e87f265695b939a69
+MISC ChangeLog 20830 RMD160 e17761b43b35c144e970290aded1da86c40cb00c SHA1 7d9722e00399afde302da709e64d5f4793d93b9e SHA256 aff3603fbc8ed97f4ffeb188a7a2dcbc84141ecf00383b1e46cb25925f5c1088
 MISC metadata.xml 865 RMD160 7188d730684d02d8bcf8dbce413c01ae50b84ad1 SHA1 4815bcf6d0c2c61c6186ecde52d984669c44ccfd SHA256 08f789d1d92184515d9360b20c7ec0f8554977c470c702c659e79aced68edf38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJObSefAAoJEOf+E+/4L5LmmqsQAK8/uxZavYqZ0i5Jaz7Cjdqm
-Sb0K024/auL3CAUZtxjSp+fPY9tzj58qvCpPwnup9m3tVeM2TP5M467K5XThy+9e
-x8BL2Zw96N83HjQ3vwdjRLS50QZ8HHpxOrhAKDNdnXWsSPZRprSfE6FzVU2lyMU7
-RLpii1XHoD2mY/SjF/XVQY5GqEZlc/EtHSNnEYB4ZRvUWn9/2gxv6mr8Pm2KGj0K
-tsHTKpnnt0o6+J6Byrx27SlB5OPKG+yQyi/pT/4Fri4qZpoti7pkF8ihi+07+FyQ
-R4VtnAHfqzwurlOJpUo79cZ/3XS8IRrqtvlnxj7DcIZYN/g1Hx3l7Led/9D42Fz+
-GOLOqRc8Gv8u6Jpof4cWY7NFa+wTb9OkxK9jTERMybmSo5eQvMSzz70QEINDuwfl
-DQ2WgrjlpHw7irpNhfySt6mliqsM4rF8xZikKuzM3NHclZpidpNcpS7zKQ3iA3Yx
-FTnES5r/imtOjMJCnHouMJifnzMhTHPU/V3QesLGg01/hfOm5nE3/h3liZVC2yif
-Cjl084yNQsU/6tWzF6EzrTMWWYl34Am6VpHF47dPKeKImQMibJbHpVOxcD9AkoeF
-a2BCwAaDB1CE8+9SuP+B5o5p9KuM+3l4v7Guwl3RjJHs9Ihtm0KPbfaO7tIhfLEr
-5X4Neqbv/c3BrhD9Dnw3
-=hj2p
+iQIcBAEBCAAGBQJOblZHAAoJEOf+E+/4L5LmaNIP+wS65jVdlkMM0oDOZZ6cYLEr
+6pHaknwJyLu9XFFudpS5KfWWzpMocJ0CHapv2rRjnoE+c4+zVbcagdr2nIRjRu5q
+o/3QI9vwyuh+FzKMOHb1qi37NESAOAhTjXQijWIIcRxivlV2upUIT1GKfxZbGc3y
+zr3e0sj28py9qjipyEB9ftkklEObgxjxly4OMRN6kdeCv1hBnEeX6ydRlODwp5/1
+vnnVnJfkTJLZkVNceHAVRt7rTFFEmTC+y/6MwpVrnLHR2+KIEL/8Zn0788Q1zJOV
+omV3wzg51U+/W+ZMzud4xxoFXDO+eNZTGgtaeBzR9FRmeYZ91tOcf+oimNFMFMkh
+CqpBd+/+2WUHa1EvS02cijQuLugVUYtNOUuaCgkjtW7mpsxTJFdPH7pGmKATokAp
+lbY4yRAVszj9AAHkudKsVqkPE3CQnABQXdYcOAbJmMr98wQmtBIRzROmlKV4ngwF
+tIspRr83DrQFygzIC0fNG6QSzBySQV2MSpQwAzPBGY75PUUe3k4IGEISuqRIc9W4
+PyUlLjrJ7EaiCaNlpuQKXwKBCH6IsJCRG0MDOCohyrgxy2R/aNY7OsvAzlH9uIog
+r0kK+nt0cWjVE2nAcYuArBpMGYuaK87QknzfdfJTJqIkyBwJ/uEvCgUd9M//hsPl
+47rWKsHNAOBMEvnQgMBP
+=5q2U
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r4.ebuild
similarity index 95%
rename from app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild
rename to app-emulation/xen-tools/xen-tools-4.1.1-r4.ebuild
index 2826cdb8c27aa7ce10e5d9167c7a33aa2bc66162..c3b655dcc98827eb7bbb8ebe2669b72be9a88463 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r3.ebuild,v 1.2 2011/09/11 21:27:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r4.ebuild,v 1.1 2011/09/12 18:59:01 alexxy Exp $
 
 EAPI="3"
 
@@ -12,7 +12,9 @@ if [[ $PV == *9999 ]]; then
        live_eclass="mercurial"
 else
        KEYWORDS="~amd64 ~x86"
-       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+       XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
+       $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
        S="${WORKDIR}/xen-${PV}"
 fi
 
@@ -124,6 +126,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
        sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"
        # Drop .config
        sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -171,6 +174,12 @@ src_prepare() {
 
        # Do not strip binaries
        epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+       # Prevent the downloading of ipxe
+       sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
+               -e 's:^\tfi:#\tfi:' -i \
+               -e 's:^\tmv _$T $T:#\tmv _$T $T:' \
+               -i tools/firmware/etherboot/Makefile || die
 }
 
 src_compile() {

diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
index f6612de609243e404f0ffb660b361fb94b14674e..401fa77e3babbc9c375f655b7e98e24af9f1bd28 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.5 2011/09/11 21:27:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-9999.ebuild,v 1.6 2011/09/12 18:59:01 alexxy Exp $
 
 EAPI="3"
 
@@ -12,7 +12,9 @@ if [[ $PV == *9999 ]]; then
        live_eclass="mercurial"
 else
        KEYWORDS="~amd64 ~x86"
-       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+       XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
+       $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
        S="${WORKDIR}/xen-${PV}"
 fi
 
@@ -124,6 +126,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
        sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"
        # Drop .config
        sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -171,6 +174,12 @@ src_prepare() {
 
        # Do not strip binaries
        epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+       # Prevent the downloading of ipxe
+       sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
+               -e 's:^\tfi:#\tfi:' -i \
+               -e 's:^\tmv _$T $T:#\tmv _$T $T:' \
+               -i tools/firmware/etherboot/Makefile || die
 }
 
 src_compile() {