diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index 267935dcddb9..ab4ef9cd8420 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -1,18 +1,10 @@
-DIST festival-1.96-beta.tar.gz 731682 SHA256 4fa48d3525957762c83f289fba361063b8855f57ff50b7db22754d844aeadbee SHA512 3ab2d0f41d66f1ed20e549f3c4a4fd7e2a9a33ad7fc6cfb6b246ff8feabc0d46e4b6eaa2c4e876b02f220080a0f04a634b3288b2b87603abf64c05015fe5bf68 WHIRLPOOL 354223c334b5b31b172fc37e30e3d3bc05836cfc4d0887931984eb2f834195393357b69832cefc0804e3f29d7c29530c32879274022c893d953a73cfdfe5adbc
DIST festival-2.1-release.tar.gz 787313 SHA256 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080 SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a WHIRLPOOL 0e90a9b3e673ea7ca63a4fdb7f60868db3a74347281267aad20a94548f385b8c1a66472145f0b7c7e4c02a30a695ca012e25443ffdb9ecbafd4cd3bac2f72568
DIST festlex_CMU.tar.gz 1925748 SHA256 c19430919bca45d5368cd4c82af6153fbcc96a487ebd30b78b5f3c08718b7c07 SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b WHIRLPOOL 040094e7dcbfb280a18b5862927855cdde62a49f8eac8d63045c1f92f720cc0041f2991ebacb05d457cd77c4c471e935a808a6e185df28e7f87d0e1d08f21905
DIST festlex_OALD.tar.gz 1472516 SHA256 61afc02c4b9dee6322412958ea8be477ee451c3cdab789b88c4907e3e377ccd5 SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac WHIRLPOOL 12f96f04d0b7257a032e9e720136bb79e1377fa63f83cd5f3b35dbed5687da838dc4c11de183df89794a389d139c83ea1ea4df3ab6e7c87018c408ed9dbdf290
DIST festlex_POSLEX.tar.gz 242914 SHA256 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47 WHIRLPOOL 8c5b1ed51b89377bb56cfdb12cc0affb9646cdf57b8c908deb547c3bb08c66881c59bef5f04ed1973b6f00c8ce45e0f85b9339afddb2bc460599f5ca11b8f05e
-DIST festvox_cmu_us_awb_arctic_hts.tar.gz 878090 SHA256 56b930028a14efdaa01b8b34add087bcde75b774b97b205d2f478413203d9a4d SHA512 78e923fb6b8f21361b19fb2f38b3c71f06bde14233c88ea10abad593e384641f0a6a8952a90badbffd5671a8be58eaca7b1cda1c3bfe313157316e09d5804891 WHIRLPOOL a97724c564ba47e5f1784d0ccce44b653728646dcac41b2db0c1eaac8f23887ba604d01c9c03e0793c6941e9fadde3bd1c3b2d41c4c1ccd2a70eae37be0c3556
DIST festvox_cmu_us_awb_cg.tar.gz 4452760 SHA256 f6010538b3e2f32152cc75741a62b8c7eecfaa3e51153c9db735723002807264 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b WHIRLPOOL fe2aa698dfa917f8e72c49bb1399c3c430d65da2b3b072d53cb6810e6cde49b19de8c5b44e0ee23647a93ded1fc6a39c80eab059c25e3eb28805a7d9977f3539
-DIST festvox_cmu_us_bdl_arctic_hts.tar.gz 1060641 SHA256 caa679c728c8804f4a1dae6ab08e7b31f10b292e572598fb6432d0e18f40bd2b SHA512 c8ca253a15365b2f269c28cb82412581d63eef5ac21480c17871f6513bbddab7c4245a47b353c5e611272cebd5a5a050dd9d2fe72034f076d431bba1eaba9997 WHIRLPOOL eb0f5bea4cc85ceb53695baf1052d9642839079fd4e5b1d16dc9ddc877373d6f7bb08636183860f0b501afaca0bbb1e4d930c7f058ae667f149bc5ae8b04b75b
-DIST festvox_cmu_us_jmk_arctic_hts.tar.gz 909045 SHA256 e4f623d1114922c8844ec266d46d558e1521e0ab3bc6e958cdf8f69c28bcc038 SHA512 66e2ea23af2c1efb19a0a039481c439c1b179fa5ad4205f5b4855682927cf772d36238cfe5c2fb681553a79635e4b902fce2ea521b4754efe3e13167a56ca634 WHIRLPOOL 8e396b1f9a9bafe7d6fdbc539741c34c33300ab4a5a1b03e3105d9494f070c0f77d8892fbe1da0c3d91d8ac78ff3800c22310a9bf7a606e52e51a0203c32d7c1
DIST festvox_cmu_us_rms_cg.tar.gz 5222226 SHA256 5f0ffc3181df76b63f3c13db3cdc6e67e02639a3982c6b6fa55bbbd2fe1cbc30 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172 WHIRLPOOL c9a5f712952c2c88d901e49cf33f03328d44fd6befaca16bcf5041a82beeb092bd6fd47751b7da9da6393c752a3b4b9ae52119a99a6ad1aca6b335cc78a8c2ae
DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811936be57f0b788908f06c3d9b330856ad8357b128 SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8 WHIRLPOOL 2e87cedb571b4ece257e8c27ab9570fe183691ebc17ddb8fc4323201bd4fc2a449f30a5879a3ce8cc8f8673283c3162761235bf253c96a089d86796b898607a0
DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832
-DIST festvox_kedlpc16k.tar.gz 4221528 SHA256 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36 SHA512 9fc3665bb03484ba20bd1ad80f2acba6c3fa23cef8e23b2d3e3723415aa0ed57c5c184e5393783b3636af735188eff9f106d0993f46c89a2571b9fe8c48c86be WHIRLPOOL 3e252c3f283238d79a615a7f27a1d1781ad795ef4e5615466a079d1034aefea209d286d02839600624ad01c994f0be65b0e436606a5d57546df592935781d25b
DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557
-DIST festvox_us1.tar.gz 11040 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e SHA512 7ac318f700c8fade65da80f33b86b124cd8f71bb687aa7a7c355dc1087a3bd01a3b28fdef3a2eff6458836bbf8e90dd7802b58177f4c73eba3a737e6646a1f9d WHIRLPOOL d26dd836725ba14f2d21f8f8cbb19fab1df0dfd282fe6b14f3a768660c32f32c2472ef5dc066f952392c6fa53077c4d81c67f3794242288fef65180a61cbc69e
-DIST festvox_us2.tar.gz 11037 SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c SHA512 73fcc610cc2eab225deebf6648895c2be3d4a604f88b171c75991136dac65a0d65f36d3e588188e96e7c70a341cdb3756c82573e6150a587099da54c8ce511a6 WHIRLPOOL 3bc8ee82f275a617335502bf90552aabdcb067fe948dc479276f773499dedb116964327a46e977229991fab282afb0b88d99c6cc7c00bdf5a9eeb28e596c845e
-DIST festvox_us3.tar.gz 11220 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8 SHA512 e9e62e977fe462db0d2d7c5bbe6e871dddeec4bd7d240ecd1e5e5fddddecf177d21263fdb4ebb42a0aac36dea72c64f5cf42d38d838457c26821be46b7202aa7 WHIRLPOOL 503e16c239262526d4542e303149aa842559b1aba44d19fae0f8524d0a9dfe8fe4c676f571944afc92437a18c683b7d5b426df1c269b3e030778e4900cb0be40
DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
diff --git a/app-admin/collectd/collectd-5.1.1-r1.ebuild b/app-admin/collectd/collectd-5.1.1-r1.ebuild
index c3c45b1bc54c..f5f77b07f66b 100644
--- a/app-admin/collectd/collectd-5.1.1-r1.ebuild
+++ b/app-admin/collectd/collectd-5.1.1-r1.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-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.1 2012/12/03 20:49:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $
EAPI="4"
@@ -351,4 +351,4 @@ pkg_postinst() {
elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
fi
-}
\ No newline at end of file
+}
diff --git a/app-admin/collectd/collectd-5.2.0.ebuild b/app-admin/collectd/collectd-5.2.0.ebuild
index 6902a6b41782..377bf3b2c972 100644
--- a/app-admin/collectd/collectd-5.2.0.ebuild
+++ b/app-admin/collectd/collectd-5.2.0.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-admin/collectd/collectd-5.2.0.ebuild,v 1.1 2012/12/03 20:57:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.0.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $
EAPI="4"
@@ -353,4 +353,4 @@ pkg_postinst() {
elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
fi
-}
\ No newline at end of file
+}
diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild
index 658d1b70b30a..f27e2d74b83e 100644
--- a/app-admin/conky/conky-1.9.0-r1.ebuild
+++ b/app-admin/conky/conky-1.9.0-r1.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-admin/conky/conky-1.9.0-r1.ebuild,v 1.6 2012/11/30 15:28:51 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.7 2012/12/04 20:58:53 billie Exp $
EAPI=4
@@ -26,7 +26,7 @@ DEPEND_COMMON="
>=dev-lua/toluapp-1.0.93
>=dev-lang/lua-5.1.4-r8
media-libs/imlib2 )
- nvidia? ( x11-drivers/nvidia-drivers[tools] )
+ nvidia? ( media-video/nvidia-settings )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage
diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild
index 05b062b3d2c1..0172d03929f5 100644
--- a/app-admin/conky/conky-1.9.0.ebuild
+++ b/app-admin/conky/conky-1.9.0.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-admin/conky/conky-1.9.0.ebuild,v 1.9 2012/11/30 15:28:51 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.10 2012/12/04 20:58:53 billie Exp $
EAPI=4
@@ -26,7 +26,7 @@ DEPEND_COMMON="
>=dev-lua/toluapp-1.0.93
>=dev-lang/lua-5.1.4-r8
media-libs/imlib2 )
- nvidia? ( x11-drivers/nvidia-drivers[tools] )
+ nvidia? ( media-video/nvidia-settings )
truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
x11-libs/libX11
x11-libs/libXdamage
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index e33c22b67ce9..5df39140ebaa 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -23,7 +23,7 @@
enable monitoring of music played by media-sound/moc
enable monitoring of music controlled by media-sound/mpd
enable syntax highlighting for app-editors/nano
- enable reading of nvidia card temperature sensors via x11-drivers/nvidia-drivers
+ enable reading of nvidia card temperature sensors via media-video/nvidia-settings
enable support for tcp (ip4) port monitoring
enable support for IBM/Lenovo notebooks
enable support for metar weather service
diff --git a/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild
index 21c303d269f4..02b1ddd9e2f3 100644
--- a/app-admin/durep/durep-0.9-r4.ebuild
+++ b/app-admin/durep/durep-0.9-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-admin/durep/durep-0.9-r4.ebuild,v 1.2 2012/12/01 21:30:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r4.ebuild,v 1.3 2012/12/04 10:43:58 blueness Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
new file mode 100644
index 000000000000..f837d2845d54
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
@@ -0,0 +1,20 @@
+--- localepurge.orig 2012-12-04 23:15:29.422756767 +0100
++++ localepurge 2012-12-04 23:16:13.313756491 +0100
+@@ -198,7 +198,7 @@
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+ if test $SPACETMP -gt 0 ; then
+- LOCALETOTAL=$SPACETMP
++ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
+ einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+ fi
+ SPACETMP=0
+@@ -230,7 +230,7 @@
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+ if test $SPACETMP -gt 0 ; then
+- MANTOTAL=$SPACETMP
++ MANTOTAL=$(($MANTOTAL + $SPACETMP))
+ einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+ fi
+ SPACETMP=0
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
new file mode 100644
index 000000000000..2b052ddf4d99
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
@@ -0,0 +1,18 @@
+--- localepurge.orig 2012-12-04 23:08:17.754765708 +0100
++++ localepurge 2012-12-04 23:09:02.397765264 +0100
+@@ -165,7 +165,14 @@
+ ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++ # if symlink, REMOVEPATH could be removed
++ # check from parentdir then
++ if [ -d ${REMOVEPATH} ]; then
++ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++ else
++ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
++ fi
++
+ SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
+
+ if test $SPACESUM -gt 0 ; then
diff --git a/app-admin/localepurge/localepurge-0.5.4.ebuild b/app-admin/localepurge/localepurge-0.5.4-r1.ebuild
similarity index 84%
rename from app-admin/localepurge/localepurge-0.5.4.ebuild
rename to app-admin/localepurge/localepurge-0.5.4-r1.ebuild
index 566db004ec7f..e696a1b531c4 100644
--- a/app-admin/localepurge/localepurge-0.5.4.ebuild
+++ b/app-admin/localepurge/localepurge-0.5.4-r1.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-admin/localepurge/localepurge-0.5.4.ebuild,v 1.1 2012/12/03 19:27:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4-r1.ebuild,v 1.1 2012/12/04 22:36:49 hwoarang Exp $
EAPI=4
@@ -23,6 +23,10 @@ S=${WORKDIR}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${P}-prefix.patch
+ # 164544
+ epatch "${FILESDIR}"/${P}-directorysum.patch
+ # 445910
+ epatch "${FILESDIR}"/${P}-parentdir.patch
eprefixify ${PN}
}
diff --git a/app-arch/libpar2/libpar2-0.2.1.ebuild b/app-arch/libpar2/libpar2-0.2.1.ebuild
index 78b61a2633a4..eb32cbe15e85 100644
--- a/app-arch/libpar2/libpar2-0.2.1.ebuild
+++ b/app-arch/libpar2/libpar2-0.2.1.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-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.5 2012/12/04 11:24:38 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="static-libs"
RDEPEND="dev-libs/libsigc++:2"
diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml
index 633b5daddbe3..44a8af7cc4d1 100644
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@@ -4,7 +4,7 @@
python
proxy-maintainers
- johneed@hotmail.com
+ idella4@gentoo.org
Ian Delaney
diff --git a/app-doc/NaturalDocs/metadata.xml b/app-doc/NaturalDocs/metadata.xml
index 313ec1f9419b..bef41978a849 100644
--- a/app-doc/NaturalDocs/metadata.xml
+++ b/app-doc/NaturalDocs/metadata.xml
@@ -10,9 +10,8 @@
and high-quality generated output.
- johneed@hotmail.com
+ idella4@gentoo.org
Ian Delaney
- Proxy maintainer, assign bugs
titanofold@gentoo.org
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 4a400918c29d..bacb4593c4ca 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-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/qemu/qemu-9999.ebuild,v 1.34 2012/11/21 22:22:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $
EAPI="4"
@@ -68,7 +68,7 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
- spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+ spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
@@ -88,7 +88,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss )
- spice? ( >=app-emulation/spice-protocol-0.8.1 )
+ spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.3.4 )
virtfs? ( sys-libs/libcap )
diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 28dcc7d8d2b8..57c6f5ecc633 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -8,7 +8,6 @@
required when using app-emulation/libvirt with
PolicyKit authentication
-
Depend on the proper libraries needed to connect to SASL-enabled
libvirtd instances (e.g. Kerberos-protected instances).
@@ -16,5 +15,8 @@
Support connecting to SPICE-enabled virtual machines.
+
+ Support connecting to VNC-enabled virtual machines.
+
diff --git a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
index 08896c389493..075c5db5bce7 100644
--- a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.9.4.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/virt-manager/virt-manager-0.9.4.ebuild,v 1.2 2012/10/15 10:06:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.3 2012/12/04 23:16:49 cardoe Exp $
EAPI=4
@@ -34,20 +34,26 @@ DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
HOMEPAGE="http://virt-manager.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="gnome-keyring policykit sasl spice"
+IUSE="gnome-keyring policykit sasl +spice +vnc"
RDEPEND=">=dev-python/pygtk-1.99.12
>=app-emulation/libvirt-0.7.0[python,sasl?]
>=dev-libs/libxml2-2.6.23[python]
${VIRTINSTDEP}
>=gnome-base/librsvg-2
>=x11-libs/vte-0.12.2:0[python]
- >=net-libs/gtk-vnc-0.3.8[python,sasl?]
>=dev-python/dbus-python-0.61
>=dev-python/gconf-python-1.99.11
dev-python/urlgrabber
gnome-keyring? ( dev-python/gnome-keyring-python )
policykit? ( sys-auth/polkit )
- spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
+ spice? (
+ >=net-misc/spice-gtk-0.6[python,sasl?]
+ || (
+ <=net-misc/spice-gtk-0.14[python,sasl?,-gtk3]
+ >=net-misc/spice-gtk-0.14-r1[python,sasl?]
+ )
+ )
+ vnc? ( >=net-libs/gtk-vnc-0.3.8[python,sasl?] )"
# tui? ( >=dev-python/new_syrup-0.1.2 )"
DEPEND="${RDEPEND}
app-text/rarian
diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..a04535fdc9b6
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild,v 1.1 2012/12/04 23:10:18 cardoe Exp $
+
+EAPI=5
+inherit eutils gnome2 toolchain-funcs
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3 nsplugin sasl +spice +vnc"
+
+RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
+ >=dev-libs/libxml2-2.6
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( >=x11-libs/gtk+-2.18:2 )
+ nsplugin? (
+ >=dev-libs/nspr-4
+ >=x11-libs/gtk+-2.18:2
+ )
+ spice? ( >=net-misc/spice-gtk-0.12.101[sasl?,gtk3=] )
+ vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3=] )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ nsplugin? ( =net-misc/npapi-sdk-0.27 )
+ spice? ( >=app-emulation/spice-protocol-0.10.1 )"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_nsplugin"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk"
+
+pkg_setup() {
+ G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
+
+ GTK2_G2CONF="${G2CONF} $(use_enable nsplugin plugin)"
+ GTK2_G2CONF="${G2CONF} --with-gtk=2.0"
+
+ GTK3_G2CONF="${G2CONF} --with-gtk=3.0"
+}
+
+src_prepare() {
+ mkdir ${GTK2_BUILDDIR} || die
+ mkdir ${GTK3_BUILDDIR} || die
+
+ epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
+}
+
+src_configure() {
+ if use nsplugin; then
+ export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
+ export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
+ fi
+
+ export ECONF_SOURCE="${S}"
+
+ cd ${GTK2_BUILDDIR}
+ echo "Running configure in ${GTK2_BUILDDIR}"
+ G2CONF="${GTK2_G2CONF}" gnome2_src_configure
+
+ if use gtk3; then
+ cd ${GTK3_BUILDDIR}
+ echo "Running configure in ${GTK3_BUILDDIR}"
+ G2CONF="${GTK3_G2CONF}" gnome2_src_configure
+ fi
+}
+
+src_compile() {
+ cd ${GTK2_BUILDDIR}
+ echo "Running make in ${GTK2_BUILDDIR}"
+ default
+
+ if use gtk3; then
+ cd ${GTK3_BUILDDIR}
+ echo "Running make in ${GTK3_BUILDDIR}"
+ default
+ fi
+}
+
+src_test() {
+ cd ${GTK2_BUILDDIR}
+ echo "Running make check in ${GTK2_BUILDDIR}"
+ default
+
+ if use gtk3; then
+ cd ${GTK3_BUILDDIR}
+ echo "Running make check in ${GTK3_BUILDDIR}"
+ default
+ fi
+}
+
+src_install() {
+ cd ${GTK2_BUILDDIR}
+ echo "Running make install in ${GTK2_BUILDDIR}"
+ default
+
+ if use gtk3; then
+ cd ${GTK3_BUILDDIR}
+ echo "Running make install in ${GTK3_BUILDDIR}"
+ default
+ fi
+}
diff --git a/app-emulation/virtualbox-bin/files/10-virtualbox.rules b/app-emulation/virtualbox-bin/files/10-virtualbox.rules
index 8efff249f8fc..014c164a37f5 100644
--- a/app-emulation/virtualbox-bin/files/10-virtualbox.rules
+++ b/app-emulation/virtualbox-bin/files/10-virtualbox.rules
@@ -1,7 +1,7 @@
# create second tree of USB devices according to
# http://www.virtualbox.org/ticket/7759#comment:5
-SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
index 23fca6d11ea0..73c45ede2bec 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
- insinto /lib/udev/rules.d
+ local udevdir="$(udev_get_udevdir)"
+ insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
- # move udev scripts into /lib/udev (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ # move udev scripts into ${udevdir} (bug #372491)
+ mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
index 7103010e75b7..b2217d8a768e 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
- insinto /lib/udev/rules.d
+ local udevdir="$(udev_get_udevdir)"
+ insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
- # move udev scripts into /lib/udev (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ # move udev scripts into ${udevdir} (bug #372491)
+ mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index f4b5e33d5335..1214c3fe34b3 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,4 +5,5 @@ DIST ocaml-3.11 11661 SHA256 b919112964cf64bcae841301754402184ceee177ab6681e75bf
DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
+DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
new file mode 100644
index 000000000000..73c04931b31d
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
@@ -0,0 +1,149 @@
+diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
+--- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800
++++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800
+@@ -124,7 +124,7 @@
+ #include
+ #include
+ #include
+-
++#include
+ #ifndef _REENT_ONLY
+
+ unsigned long long
+diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c
+newlib-1.16.0/newlib/doc/makedoc.c
+--- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900
++++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800
+@@ -39,7 +39,7 @@
+ #include
+ #include
+ #include
+-
++#include
+ #define DEF_SIZE 5000
+ #define STACK 50
+
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
+--- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800
++++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of lseek system call. */
+
+-#include
++#include "../include/reent.h"
+ #include
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of this functions. Those
+ targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
+--- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800
+@@ -119,7 +119,7 @@
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
+- return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
++ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
+ }
+
+ /* Make sure stdio is set up. */
+
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
+--- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800
++++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of fstat system call. This implementation just
+ calls the fstat system call. */
+
+-#include
++#include "../include/reent.h">
+ #include
+ #include
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ #ifdef __LARGE64_FILES
+
+diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
+--- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800
++++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800
+@@ -68,6 +68,9 @@
+
+ #include "cygmon-gmon.h"
+
++#include
++#include
++#include
+ /*
+ * froms is actually a bunch of unsigned shorts indexing tos
+ */
+@@ -78,6 +78,8 @@
+ static char *s_lowpc = 0;
+ static char *s_highpc = 0;
+ static unsigned long s_textsize = 0;
++extern void profil_write(int, char*, int);
++extern int moncontrol (int);
+
+ static int ssiz;
+ static char *sbuf;
+diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h
+newlib-1.16.0/newlib/libc/include/_syslist.h
+--- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800
++++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800
+@@ -2,6 +2,7 @@
+ and only provide C names, so that we end up in violation of ANSI */
+ #ifndef __SYSLIST_H
+ #define __SYSLIST_H
++#include
+
+ #ifdef MISSING_SYSCALL_NAMES
+ #define _close close
+
+#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
+#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800
+#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
+--- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800
+@@ -93,7 +93,7 @@
+
+ /* Only do 64-bit tell on large file. */
+ if (!(fp->_flags & __SL64))
+- return (_off64_t) _ftello_r (ptr, fp);
++ return (_off64_t) _ftello64_r (ptr, fp);
+
+ /* Ensure stdio is set up. */
+
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
+--- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800
++++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of open system call. */
+
+-#include
++#include "../include/reent.h">
+ #include
+-#include
++#include
+ #include <_syslist.h>
+
+ #ifdef __LARGE64_FILES
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
+--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
++++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of syscalls need to support signal/raise.
+ These implementations just call the usual system calls. */
+
+-#include
++#include "../include/reent.h"
+ #include
+ #include
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of these functions. Those
+ targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */
+
diff --git a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
new file mode 100644
index 000000000000..78eb12b0fc64
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
@@ -0,0 +1,37 @@
+# Fix gcc-4.6
+diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
+--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
++++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
+@@ -6,7 +6,7 @@
+
+ # Define some default flags.
+ # NB. '-Wcast-qual' is nasty, so I omitted it.
+-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
++DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
+diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
+--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
++++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
+@@ -73,7 +73,7 @@
+
+ -include $(XEN_TARGET_ARCH)/Makefile
+
+-CFLAGS += -Werror -Wmissing-prototypes
++CFLAGS += -Wmissing-prototypes
+ CFLAGS += -I. $(CFLAGS_xeninclude)
+
+ # Needed for posix_fadvise64() in xc_linux.c
+# Drop .config
+diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
+--- Config.mk 2012-09-17 18:23:12.000000000 +0800
++++ Config.mk 2012-12-05 14:01:10.641260261 +0800
+@@ -7,7 +7,6 @@
+ # fallback for older make
+ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
+
+--include $(XEN_ROOT)/.config
+
+ # A debug build of Xen and tools?
+ debug ?= n
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
new file mode 100644
index 000000000000..70ff7da2f60f
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
@@ -0,0 +1,112 @@
+# Patch Makefile to patch insource newlib,
+# Prevent internal downloading of external packages
+diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
+--- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800
++++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800
+@@ -8,30 +8,30 @@
+ include $(XEN_ROOT)/Config.mk
+
+ #ZLIB_URL?=http://www.zlib.net
+-ZLIB_URL=$(XEN_EXTFILES_URL)
++ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ ZLIB_VERSION=1.2.3
+
+ #LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
+-LIBPCI_URL?=$(XEN_EXTFILES_URL)
++LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ LIBPCI_VERSION=2.2.9
+
+ #NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
+-NEWLIB_URL?=$(XEN_EXTFILES_URL)
++NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ NEWLIB_VERSION=1.16.0
+
+ #LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
+-LWIP_URL?=$(XEN_EXTFILES_URL)
++LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ LWIP_VERSION=1.3.0
+
+ #GRUB_URL?=http://alpha.gnu.org/gnu/grub
+-GRUB_URL?=$(XEN_EXTFILES_URL)
++GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ GRUB_VERSION=0.97
+
+-#OCAML_URL?=$(XEN_EXTFILES_URL)
++#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11
+ OCAML_VERSION=3.11.0
+
+-WGET=wget -c
++WGET=cp -t .
+
+ GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
+ ifeq ($(XEN_TARGET_ARCH),x86_32)
+@@ -95,12 +95,13 @@
+ ##############
+
+ newlib-$(NEWLIB_VERSION).tar.gz:
+- $(WGET) $(NEWLIB_URL)/$@
++# $(WGET) $(NEWLIB_URL)/$@
+
+ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
+ tar xzf $<
+ patch -d $@ -p0 < newlib.patch
+ patch -d $@ -p0 < newlib-chk.patch
++ patch -d $@ -p0 < newlib-implicits.patch
+ patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ find $@ -type f | xargs perl -i.bak \
+ -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+@@ -112,7 +113,7 @@
+ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
+ mkdir -p newlib-$(XEN_TARGET_ARCH)
+ ( cd newlib-$(XEN_TARGET_ARCH) && \
+- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
++ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ $(CROSS_MAKE) && \
+ $(CROSS_MAKE) install )
+
+@@ -121,7 +122,7 @@
+ ############
+
+ zlib-$(ZLIB_VERSION).tar.gz:
+- $(WGET) $(ZLIB_URL)/$@
++# $(WGET) $(ZLIB_URL)/$@
+
+ zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz
+ tar xzf $<
+@@ -141,7 +142,7 @@
+ ##############
+
+ pciutils-$(LIBPCI_VERSION).tar.bz2:
+- $(WGET) $(LIBPCI_URL)/$@
++# $(WGET) $(LIBPCI_URL)/$@
+
+ pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
+ tar xjf $<
+@@ -169,7 +170,7 @@
+ ######
+
+ lwip-$(LWIP_VERSION).tar.gz:
+- $(WGET) $(LWIP_URL)/$@
++# $(WGET) $(LWIP_URL)/$@
+
+ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
+ tar xzf $<
+@@ -325,7 +326,7 @@
+ ######
+
+ grub-$(GRUB_VERSION).tar.gz:
+- $(WGET) $(GRUB_URL)/$@
++#$(WGET) $(GRUB_URL)/$@
+
+ grub-upstream: grub-$(GRUB_VERSION).tar.gz
+ tar xzf $<
+@@ -392,7 +393,7 @@
+ $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
+
+-install-grub: pv-grub
++install-grub:
+ $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
+
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
new file mode 100644
index 000000000000..6b184db2008e
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
@@ -0,0 +1,12 @@
+diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
+--- stubdom/Makefile 2012-12-05 08:01:01.480241322 +0800
++++ stubdom/Makefile 2012-12-05 08:01:37.432238026 +0800
+@@ -101,6 +101,7 @@
+ tar xzf $<
+ patch -d $@ -p0 < newlib.patch
+ patch -d $@ -p0 < newlib-chk.patch
++ patch -d $@ -p0 < newlib-implicits.patch
+ patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ find $@ -type f | xargs perl -i.bak \
+ -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
index be76528bc5a9..ae03f0c27a0b 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.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/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.5 2012/04/24 09:49:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.7 2012/12/04 19:24:18 scarabeus Exp $
EAPI="2"
@@ -17,7 +17,7 @@ SRC_URI="
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
- $OCAML_URL/ocaml-3.11
+ $OCAML_URL/ocaml-3.11
"
S="${WORKDIR}/xen-${PV}"
@@ -75,14 +75,14 @@ src_prepare() {
ls -ld stubdom/zlib-1.2.3.tar.gz
ls -ld stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
- sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
+ sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
-i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
- einfo "1st Makefile adjusted"
+ einfo "1st Makefile adjusted"
}
src_compile() {
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
index d5240b79ac71..611aa97fa4ee 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.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/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.3 2012/04/24 09:49:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.4 2012/12/04 16:31:20 idella4 Exp $
EAPI="2"
@@ -17,7 +17,7 @@ SRC_URI="
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
- $OCAML_URL/ocaml-3.11
+ $OCAML_URL/ocaml-3.11
"
S="${WORKDIR}/xen-${PV}"
@@ -73,7 +73,7 @@ src_prepare() {
einfo "files copied to stubdom"
- sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
+ sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild
new file mode 100644
index 000000000000..01b7112774fc
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild,v 1.1 2012/12/04 16:31:20 idella4 Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+ http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+ $GRUB_URL/grub-0.97.tar.gz
+ $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+ $LIBPCI_URL/pciutils-2.2.9.tar.bz2
+ $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+ $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+DEPEND="sys-devel/gettext
+ sys-devel/gcc"
+
+RDEPEND="=app-emulation/xen-${PV}"
+
+src_prepare() {
+
+ # if the user *really* wants to use their own custom-cflags, let them
+ if use custom-cflags; then
+ einfo "User wants their own CFLAGS - removing defaults"
+ # try and remove all the default custom-cflags
+ find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+ -i {} \;
+ fi
+
+ #Substitute for internal downloading
+ cp $DISTDIR/zlib-1.2.3.tar.gz \
+ $DISTDIR/pciutils-2.2.9.tar.bz2 \
+ $DISTDIR/lwip-1.3.0.tar.gz \
+ $DISTDIR/newlib-1.16.0.tar.gz \
+ $DISTDIR/grub-0.97.tar.gz \
+ ./stubdom/ || die "files not coped to stubdom"
+ # Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
+# cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
+# "${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
+# stubdom/grub.patches/ || die
+ einfo "files copied to stubdom"
+
+ # Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+ cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+ # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+ epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch
+
+ # Drop .config and Fix gcc-4.6
+ epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+}
+
+src_compile() {
+ use custom-cflags || unset CFLAGS
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include
+
+ # TODO; fix those -j1
+ if use x86; then
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+ XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ elif use amd64; then
+ emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+ XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+ if use multilib; then
+ multilib_toolchain_setup x86
+ emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+ fi
+ fi
+}
+
+src_install() {
+ if use x86; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ if use amd64; then
+ emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+ if use multilib; then
+ emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+ fi
+ fi
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the unoffical wiki page:"
+ elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+ elog " http://en.gentoo-wiki.com/wiki/Xen/"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 4dc432ecfc1d..8fa4a4b0f652 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,7 @@
DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031
-DIST xen-3.4.2.tar.gz 11187726 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b SHA512 a957390e91fb371155e61900f65b5d686a45b636b1c9bad1a1d942697a338d819898b605d5c3ed2ebe4b846cadfb982e711f822ad7c9c7bd2eaa2e3cfb88a55b WHIRLPOOL b073a999951da0bab3d0e8e5327d4040882335cbcb6cf78d18eb550462c73d39bb6bf8e59856ccb230601c376b0937a542073aadececf92189d8d3de9970ed22
+DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc
+DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f
DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
+DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
+DIST xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f SHA512 1b2678f1cc0b4a9bf24b6b096ed40132a757594c1c5c877468d4cb0c2fba2193cc6bf5fb55d9a0f6cc81f1bf95913758c67898d8c4398210609a6e4412583df9 WHIRLPOOL 24d544c1c1d435879be8879a69eb096c451299a0d4e07c1407d6eaaa8910c2088f2ca0c618f8c6f02fbffbf745f06c9dd4faa5cc666a069e205a28024ddf77b4
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
new file mode 100644
index 000000000000..95a1ce6f0659
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
@@ -0,0 +1,28 @@
+diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
+--- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800
++++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800
+@@ -28,13 +28,6 @@
+ $(MAKE) -C $D/src bin/$(*F).rom
+
+ $T:
+- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
+- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
+- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+- $(IPXE_GIT_TAG) | gzip >../_$T); \
+- rm -rf $D.git; \
+- fi
+- mv _$T $T
+
+ $D/src/arch/i386/Makefile: $T Config
+ rm -rf $D
+diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
+--- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800
++++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800
+@@ -18,7 +18,6 @@
+ cp ovmf-makefile ovmf/Makefile;
+
+ seabios-dir:
+- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
+ cp seabios-config seabios-dir/.config;
+
+ .PHONY: all
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch
new file mode 100644
index 000000000000..d42080c767d3
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch
@@ -0,0 +1,20 @@
+diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
+--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
++++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
+@@ -14,13 +14,13 @@
+ .PHONY: blowfish.h
+ blowfish.h:
+ rm -f blowfish.bin
+- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
++ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
+ (echo "static unsigned int blowfish32_code[] = {"; \
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
+ echo "};") >$@
+ rm -f blowfish.bin
+ ifeq ($(XEN_COMPILE_ARCH),x86_64)
+- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
++ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
+ (echo "static unsigned int blowfish64_code[] = {"; \
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
+ echo "};") >>$@
+
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
new file mode 100644
index 000000000000..de06279bd33c
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
@@ -0,0 +1,37 @@
+diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
+--- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800
++++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800
+@@ -243,7 +243,7 @@
+ install: all $(if $(BUILD_DOCS),install-doc)
+ mkdir -p "$(DESTDIR)$(bindir)"
+ ifneq ($(TOOLS),)
+- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+ endif
+ ifneq ($(BLOBS),)
+ mkdir -p "$(DESTDIR)$(datadir)"
+diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target
+--- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800
++++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800
+@@ -755,7 +755,7 @@
+
+ install: all install-hook
+ ifneq ($(PROGS),)
+- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+
+ # Include automatically generated dependency files
+diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
+--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800
++++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800
+@@ -437,9 +437,6 @@
+ install: all
+ ifneq ($(PROGS),)
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+-ifneq ($(STRIP),)
+- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
+-endif
+ endif
+ ifdef CONFIG_TRACE_SYSTEMTAP
+ ifdef CONFIG_TRACE_SYSTEMTAP
diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch
deleted file mode 100644
index be0527a7c8f8..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup
---- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700
-+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600
-@@ -3,6 +3,8 @@
-
- # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
-
-+target=i386-dm
-+
- rm -f $target/Makefile
- rm -f $target/config.mak
- rm -f config-host.mak
-@@ -11,8 +13,6 @@
-
- ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
-
--target=i386-dm
--
- if [ "x$XEN_ROOT" != x ]; then
- echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
- fi
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch
deleted file mode 100644
index 403d6124ad7b..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800
-+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800
-@@ -195,8 +195,13 @@
- pid_t pid;
- } msg_pid_t;
-
-+#ifndef READ
- #define READ 0
-+#endif
-+
-+#ifndef WRITE
- #define WRITE 1
-+#endif
-
- /*Control Messages between manager and tapdev*/
- #define CTLMSG_PARAMS 1
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch
deleted file mode 100644
index 2fe3f05c417e..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800
-+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800
-@@ -40,6 +40,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
---- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800
-+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800
-@@ -26,6 +26,7 @@
- #include "aes.h"
- #include
- #include
-+#include
- #include
- #include
- #include
---- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800
-+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800
-@@ -26,6 +26,7 @@
- #include
- #include "aes.h"
- #include
-+#include
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch
deleted file mode 100644
index fd777126d498..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800
-+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800
-@@ -23,7 +23,7 @@
- all: $(IBIN)
-
- fs-backend: $(OBJS) fs-backend.c
-- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
-
- install: all
- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
---- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800
-@@ -6,7 +6,7 @@
-
- LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
- LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
--LDFLAGS = $(LDFLAGS-y)
-+#LDFLAGS = $(LDFLAGS-y)
-
- LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
-
---- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800
-+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800
-@@ -23,5 +23,5 @@
- $(RM) *.a *.so *.o *.rpm $(BIN)
-
- %: %.c $(HDRS) Makefile
-- $(CC) $(CFLAGS) -o $@ $<
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch
deleted file mode 100644
index 8ca546b55190..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-Only in xen-3.4.2/: cflags.sh
-diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk
---- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800
-@@ -48,7 +48,7 @@
- SHLIB_CFLAGS = -shared
-
- ifneq ($(debug),y)
--CFLAGS += -O2 -fomit-frame-pointer
-+CFLAGS += -fomit-frame-pointer
- else
- # Less than -O1 produces bad code and large stack frames
- CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls
-diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk
---- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800
-@@ -45,7 +45,7 @@
- SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared
-
- ifneq ($(debug),y)
--CFLAGS += -O2 -fno-omit-frame-pointer
-+CFLAGS += -fno-omit-frame-pointer
- else
- # Less than -O1 produces bad code and large stack frames
- CFLAGS += -O1 -fno-omit-frame-pointer
-diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
---- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800
-+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800
-@@ -14,7 +14,7 @@
-
- # Tools to run on system hosting the build
- HOSTCC = gcc
--HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
-
- DISTDIR ?= $(XEN_ROOT)/dist
-diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk
---- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800
-@@ -1,8 +1,8 @@
-
- ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp
--ARCH_CFLAGS += -O2
-+#ARCH_CFLAGS += -O2
- ARCH_ASFLAGS := -x assembler-with-cpp
--ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
-+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127
- ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
-
- ARCH_LDFLAGS = -warn-common
-diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs
---- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800
-@@ -223,8 +223,8 @@
- +++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100
- @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then
- fi
-- STAGE1_CFLAGS="-O2"
-- GRUB_CFLAGS="-O2"
-+ STAGE1_CFLAGS=""
-+ GRUB_CFLAGSS=""
- - AC_CACHE_CHECK([whether optimization for size works], size_flag, [
- + AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
- saved_CFLAGS=$CFLAGS
-@@ -237,7 +237,7 @@
- + if test "x$grub_cv_cc_Os" = xyes; then
- STAGE2_CFLAGS="-Os"
- else
-- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops"
-+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops"
- @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then
- # OpenBSD has a GCC extension for protecting applications from
- # stack smashing attacks, but GRUB doesn't want this feature.
-diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure
---- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800
-@@ -1849,7 +1849,7 @@
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
-+CFLAGS=""
- echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
-@@ -1898,15 +1898,15 @@
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS=""
- else
-- CFLAGS="-g"
-+ CFLAGS=""
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+# CFLAGS="-O2"
- else
-- CFLAGS=
-+ CFLAGS=""
- fi
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800
-@@ -464,7 +464,7 @@
-
-
- # default flags for all hosts
--CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing"
-+CFLAGS="$CFLAGS -g -fno-strict-aliasing"
- CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
- LDFLAGS="$LDFLAGS -g"
- if test "$werror" = "yes" ; then
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800
-@@ -12,7 +12,7 @@
- OBJCOPY = $(CROSS)objcopy
-
- # we rely on GCC inline:ing the stuff we tell it to in many places here.
--CFLAGS = -Winline -Wall -g -O2 -static
-+CFLAGS = -Winline -Wall -g -static
- NOSTDFLAGS = -nostartfiles -nostdlib
- ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/
- LDLIBS =
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800
-@@ -6,7 +6,7 @@
- * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml
- *
- * mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \
--* -O2 -static -o hello-mips hello-mips.c
-+* -static -o hello-mips hello-mips.c
- *
- */
- #define __NR_SYSCALL_BASE 4000
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800
-@@ -2,7 +2,7 @@
- -include ../config-host.mak
- VPATH=$(SRC_PATH)/tests
-
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=-Wall -g -fno-strict-aliasing
- #CFLAGS+=-msse2
- LDFLAGS=
-
-@@ -52,7 +52,7 @@
-
- .PHONY: test-mmap
- test-mmap: test-mmap.c
-- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $<
-+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $<
- -./test-mmap
- -$(QEMU) ./test-mmap
- -$(QEMU) -p 8192 ./test-mmap 8192
-@@ -88,17 +88,17 @@
- arm-linux-ld -o $@ $<
-
- hello-arm.o: hello-arm.c
-- arm-linux-gcc -Wall -g -O2 -c -o $@ $<
-+ arm-linux-gcc -Wall -g -c -o $@ $<
-
- test-arm-iwmmxt: test-arm-iwmmxt.s
- cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@
-
- # MIPS test
- hello-mips: hello-mips.c
-- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
-+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
-
- hello-mipsel: hello-mips.c
-- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
-+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $<
-
- # testsuite for the CRIS port.
- test-cris:
-diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile
---- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800
-@@ -6,7 +6,7 @@
- libdir=$(prefix)/lib
-
- ARCH := $(shell uname -m | sed -e s/i.86/i386/)
--CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
- LINK_FLAGS=
-diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800
-+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800
-@@ -22,7 +22,7 @@
- CFLAGS = -Iinclude \
- $(shell xml2-config --cflags) \
- $(shell curl-config --cflags) \
-- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
-+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC
-
- LDFLAGS = $(shell xml2-config --libs) \
- $(shell curl-config --libs)
-diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4
---- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800
-@@ -62,7 +62,7 @@
- CFLAGS += -Wno-unused-parameter
-
- CFLAGS += -g
--CFLAGS += -O2
-+#CFLAGS += -O2
- CFLAGS += -fno-strict-aliasing
- CFLAGS += -fno-common
- #CFLAGS += -fomit-frame-pointer
-diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
---- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800
-+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800
-@@ -23,7 +23,7 @@
- DEF_CFLAGS += -DGNT_DEBUG
- DEF_CFLAGS += -DGNTMAP_DEBUG
- else
--DEF_CFLAGS += -O3
-+#DEF_CFLAGS += -O3
- endif
-
- # Make the headers define our internal stuff
-diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800
-+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800
-@@ -26,7 +26,7 @@
-
- $(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
- CFLAGS += -fno-strict-aliasing
--CFLAGS += -O3
-+#CFLAGS += -O3
- #CFLAGS += -g
-
- MAJOR := 3.0
-diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile
---- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800
-@@ -44,7 +44,7 @@
- CPPFLAGS += -D __ARCH_I386_ATOMIC__
-
- #----------------------------------------------------------------------------
--CFLAGS += -O3
-+#CFLAGS += -O3
- CFLAGS += $(INCLUDES) $(LIBS)
-
- LDFLAGS += $(LIBS)
\ No newline at end of file
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch
deleted file mode 100644
index f9c746d6a631..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
-+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
-@@ -14,7 +14,7 @@
-
- # Tools to run on system hosting the build
- HOSTCC = gcc
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
-
- DISTDIR ?= $(XEN_ROOT)/dist
-diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800
-@@ -6,7 +6,7 @@
-
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
-@@ -5,7 +5,7 @@
- QCOW_UTIL = img2qcow qcow2raw qcow-create
- LIBAIO_DIR = ../../libaio/src
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -I../lib
- CFLAGS += $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
-@@ -13,7 +13,7 @@
- SRCS :=
- SRCS += xenbus.c blkif.c xs_api.c
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -fPIC
- # get asprintf():
-diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
-@@ -2,7 +2,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenstore)
-diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--#CFLAGS += -Werror -g -O0
-+#CFLAGS += -g -O0
-
- CFLAGS += $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
-@@ -10,7 +10,7 @@
- CFLAGS += -DNDEBUG
- endif
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- # Disable PIE/SSP if GCC supports them. They can break us.
- $(call cc-option-add,CFLAGS,CC,-nopie)
-diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
-@@ -9,7 +9,7 @@
- SRCS :=
- SRCS += flask_op.c
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -fno-strict-aliasing
- CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
-
-diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
-@@ -6,7 +6,7 @@
- LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
-
- PROFILE=#-pg
--BASECFLAGS=-Wall -g -Werror
-+BASECFLAGS=-Wall -g
- BASECFLAGS+= $(PROFILE)
- #BASECFLAGS+= -I$(XEN_ROOT)/tools
- BASECFLAGS+= $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
-@@ -5,7 +5,7 @@
-
- IBIN = fs-backend
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -fno-strict-aliasing
- CFLAGS += $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
-@@ -468,7 +468,7 @@
- CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
- LDFLAGS="$LDFLAGS -g"
- if test "$werror" = "yes" ; then
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS"
- fi
-
- if test "$solaris" = "no" ; then
-@@ -1150,7 +1150,7 @@
- echo "sparse enabled $sparse"
- echo "profiler $profiler"
- echo "static build $static"
--echo "-Werror enabled $werror"
-+
- if test "$darwin" = "yes" ; then
- echo "Cocoa support $cocoa"
- fi
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
-@@ -26,7 +26,7 @@
- TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
- VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
- CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
--#CFLAGS+=-Werror
-+#CFLAGS+=
- LIBS=
- # user emulator name
- ifndef TARGET_ARCH2
-diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
-@@ -4,7 +4,7 @@
- HARNESS_SRCS:=main.c
- # io_queue.c
-
--CFLAGS=-Wall -Werror -g -O -laio
-+CFLAGS=-Wall -g -O -laio
- #-lpthread -lrt
-
- all: $(PROGS)
-diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
-@@ -1,6 +1,6 @@
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
-+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
- LDFLAGS += -L../common/
-
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
-+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
-@@ -52,7 +52,7 @@
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS += -Werror -Wmissing-prototypes
-+CFLAGS += -Wmissing-prototypes
- CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
-
- # Needed for posix_fadvise64() in xc_linux.c
-diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
-@@ -22,7 +22,7 @@
- CFLAGS = -Iinclude \
- $(shell xml2-config --cflags) \
- $(shell curl-config --cflags) \
-- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
-+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
-
- LDFLAGS = $(shell xml2-config --libs) \
- $(shell curl-config --libs)
-diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- HDRS = $(wildcard *.h)
- OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- INCLUDES += -I $(XEN_XC)
- INCLUDES += -I $(XEN_LIBXC)
-diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
-@@ -3,7 +3,7 @@
- import os
- import sys
-
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
-+extra_compile_args = [ "-fno-strict-aliasing" ]
-
- XEN_ROOT = "../.."
-
-diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
-@@ -4,7 +4,7 @@
-
- XEN_ROOT = "../.."
-
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
-+extra_compile_args = [ "-fno-strict-aliasing" ]
-
- include_dirs = [ XEN_ROOT + "/tools/libxc",
- XEN_ROOT + "/tools/xenstore",
-diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -fno-strict-aliasing
- CFLAGS += -I. $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
-@@ -25,7 +25,7 @@
- PIC_OBJS := $(LIB_SRCS:.c=.opic)
-
- $(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
--CFLAGS += -Werror -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- CFLAGS += -O3
- #CFLAGS += -g
-
-diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
-@@ -9,7 +9,7 @@
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
- # General compiler flags
--CFLAGS = -Werror -g3 -I.
-+CFLAGS = -g3 -I.
-
- # Generic project files
- HDRS = $(wildcard *.h)
-diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
-@@ -9,7 +9,7 @@
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
- # General compiler flags
--CFLAGS = -Werror -g3 -I.
-+CFLAGS = -g3 -I.
-
- # Generic project files
- HDRS = $(wildcard *.h)
-diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
-@@ -11,7 +11,7 @@
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
-
- PROGRAMS = xc_restore xc_save readnotes lsevtchn
-diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
-@@ -13,7 +13,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -I $(XEN_XC)
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenstore)
- LDFLAGS += $(LDFLAGS_libxenstore)
-
-diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
-@@ -34,7 +34,7 @@
- OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
- SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
-
--WARN_FLAGS=-Wall -Werror
-+WARN_FLAGS=-Wall
-
- CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
- LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
-diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
-
--CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
-+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
- LDFLAGS += -L$(XEN_LIBXENSTAT)
- LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
-diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
-@@ -4,7 +4,7 @@
- MAJOR = 3.0
- MINOR = 0
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -I.
- CFLAGS += $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
-@@ -865,7 +865,7 @@
- {
- unsigned int offset, datalen;
- struct node *node;
-- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
-+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
- char *name;
-
- /* Extra "strings" can be created by binary data. */
-diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-Only in xen-3.4.2/: Werror.sh
-diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
-@@ -68,7 +68,7 @@
- CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
- endif
- ifeq ($(no_warns),y)
--CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
-+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
- endif
- ifneq ($(vhpt_disable),y)
- CFLAGS += -DVHPT_ENABLED=1
-diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
-@@ -8,7 +8,7 @@
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
-
--CFLAGS += -Werror -fno-builtin -msoft-float
-+CFLAGS += -fno-builtin -msoft-float
-
- # NB. awk invocation is a portable alternative to 'head -n -1'
- %.S: %.bin
-diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
-@@ -17,7 +17,7 @@
- endif
-
- CFLAGS += -fno-builtin -fno-common
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch
deleted file mode 100644
index ef511a7db92c..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch
+++ /dev/null
@@ -1,731 +0,0 @@
-# HG changeset patch
-# User Keir Fraser
-# Date 1311171934 -3600
-# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533
-# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c
-hvmloader: Switch to absolute addressing for calling hypercall stubs.
-
-This is clearer and less fragile than trying to make relative calls
-work. In particular, the old approach failed if _start was not
-== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern
-toolchains which reorder functions.
-
-Signed-off-by: Keir Fraser
-xen-unstable changeset: 23730:dd5eecf739d1
-xen-unstable date: Wed Jul 20 15:02:16 2011 +0100
-
-
-hvmloader: Remove hard tabs from source files.
-
-Signed-off-by: Keir Fraser
-xen-unstable changeset: 23729:4f1109af9c63
-xen-unstable date: Wed Jul 20 14:52:16 2011 +0100
-
-diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h
---- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100
-+++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100
-@@ -35,147 +35,148 @@
- #include
- #include "config.h"
-
--/*
-- * NB. Hypercall address needs to be relative to a linkage symbol for
-- * some version of ld to relocate the relative calls properly.
-- */
--#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \
-- " + " STR(HYPERCALL_PHYSICAL_ADDRESS)
-+#define hcall_addr(name) \
-+ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32)
-
--#define _hypercall0(type, name) \
--({ \
-- long __res; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res) \
-- : \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall0(type, name) \
-+({ \
-+ long __res; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res) \
-+ : "0" (hcall_addr(name)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
--#define _hypercall1(type, name, a1) \
--({ \
-- long __res, __ign1; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res), "=b" (__ign1) \
-- : "1" ((long)(a1)) \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall1(type, name, a1) \
-+({ \
-+ long __res, __ign1; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res), "=b" (__ign1) \
-+ : "0" (hcall_addr(name)), \
-+ "1" ((long)(a1)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
--#define _hypercall2(type, name, a1, a2) \
--({ \
-- long __res, __ign1, __ign2; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
-- : "1" ((long)(a1)), "2" ((long)(a2)) \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall2(type, name, a1, a2) \
-+({ \
-+ long __res, __ign1, __ign2; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \
-+ : "0" (hcall_addr(name)), \
-+ "1" ((long)(a1)), "2" ((long)(a2)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
--#define _hypercall3(type, name, a1, a2, a3) \
--({ \
-- long __res, __ign1, __ign2, __ign3; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-- "=d" (__ign3) \
-- : "1" ((long)(a1)), "2" ((long)(a2)), \
-- "3" ((long)(a3)) \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall3(type, name, a1, a2, a3) \
-+({ \
-+ long __res, __ign1, __ign2, __ign3; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-+ "=d" (__ign3) \
-+ : "0" (hcall_addr(name)), \
-+ "1" ((long)(a1)), "2" ((long)(a2)), \
-+ "3" ((long)(a3)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
--#define _hypercall4(type, name, a1, a2, a3, a4) \
--({ \
-- long __res, __ign1, __ign2, __ign3, __ign4; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-- "=d" (__ign3), "=S" (__ign4) \
-- : "1" ((long)(a1)), "2" ((long)(a2)), \
-- "3" ((long)(a3)), "4" ((long)(a4)) \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall4(type, name, a1, a2, a3, a4) \
-+({ \
-+ long __res, __ign1, __ign2, __ign3, __ign4; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-+ "=d" (__ign3), "=S" (__ign4) \
-+ : "0" (hcall_addr(name)), \
-+ "1" ((long)(a1)), "2" ((long)(a2)), \
-+ "3" ((long)(a3)), "4" ((long)(a4)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
--#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
--({ \
-- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
-- asm volatile ( \
-- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \
-- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
-- : "1" ((long)(a1)), "2" ((long)(a2)), \
-- "3" ((long)(a3)), "4" ((long)(a4)), \
-- "5" ((long)(a5)) \
-- : "memory" ); \
-- (type)__res; \
-+#define _hypercall5(type, name, a1, a2, a3, a4, a5) \
-+({ \
-+ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \
-+ asm volatile ( \
-+ "call *%%eax" \
-+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \
-+ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \
-+ : "0" (hcall_addr(name)), \
-+ "1" ((long)(a1)), "2" ((long)(a2)), \
-+ "3" ((long)(a3)), "4" ((long)(a4)), \
-+ "5" ((long)(a5)) \
-+ : "memory" ); \
-+ (type)__res; \
- })
-
- static inline int
- hypercall_sched_op(
-- int cmd, void *arg)
-+ int cmd, void *arg)
- {
-- return _hypercall2(int, sched_op, cmd, arg);
-+ return _hypercall2(int, sched_op, cmd, arg);
- }
-
- static inline int
- hypercall_memory_op(
-- unsigned int cmd, void *arg)
-+ unsigned int cmd, void *arg)
- {
-- return _hypercall2(int, memory_op, cmd, arg);
-+ return _hypercall2(int, memory_op, cmd, arg);
- }
-
- static inline int
- hypercall_multicall(
-- void *call_list, int nr_calls)
-+ void *call_list, int nr_calls)
- {
-- return _hypercall2(int, multicall, call_list, nr_calls);
-+ return _hypercall2(int, multicall, call_list, nr_calls);
- }
-
- static inline int
- hypercall_event_channel_op(
-- int cmd, void *arg)
-+ int cmd, void *arg)
- {
-- return _hypercall2(int, event_channel_op, cmd, arg);
-+ return _hypercall2(int, event_channel_op, cmd, arg);
- }
-
- static inline int
- hypercall_xen_version(
-- int cmd, void *arg)
-+ int cmd, void *arg)
- {
-- return _hypercall2(int, xen_version, cmd, arg);
-+ return _hypercall2(int, xen_version, cmd, arg);
- }
-
- static inline int
- hypercall_console_io(
-- int cmd, int count, char *str)
-+ int cmd, int count, char *str)
- {
-- return _hypercall3(int, console_io, cmd, count, str);
-+ return _hypercall3(int, console_io, cmd, count, str);
- }
-
- static inline int
- hypercall_vm_assist(
-- unsigned int cmd, unsigned int type)
-+ unsigned int cmd, unsigned int type)
- {
-- return _hypercall2(int, vm_assist, cmd, type);
-+ return _hypercall2(int, vm_assist, cmd, type);
- }
-
- static inline int
- hypercall_vcpu_op(
-- int cmd, int vcpuid, void *extra_args)
-+ int cmd, int vcpuid, void *extra_args)
- {
-- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
-+ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
- }
-
- static inline int
- hypercall_hvm_op(
-- int cmd, void *arg)
-+ int cmd, void *arg)
- {
-- return _hypercall2(int, hvm_op, cmd, arg);
-+ return _hypercall2(int, hvm_op, cmd, arg);
- }
-
- #endif /* __HVMLOADER_HYPERCALL_H__ */
-diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h
---- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100
-+++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100
-@@ -1,69 +1,69 @@
- /*
-- * pci_regs.h
-+ * pci_regs.h
- *
-- * PCI standard defines
-- * Copyright 1994, Drew Eckhardt
-- * Copyright 1997--1999 Martin Mares
-+ * PCI standard defines
-+ * Copyright 1994, Drew Eckhardt
-+ * Copyright 1997--1999 Martin Mares
- *
-- * For more information, please consult the following manuals (look at
-- * http://www.pcisig.com/ for how to get them):
-+ * For more information, please consult the following manuals (look at
-+ * http://www.pcisig.com/ for how to get them):
- *
-- * PCI BIOS Specification
-- * PCI Local Bus Specification
-- * PCI to PCI Bridge Specification
-- * PCI System Design Guide
-+ * PCI BIOS Specification
-+ * PCI Local Bus Specification
-+ * PCI to PCI Bridge Specification
-+ * PCI System Design Guide
- */
-
- #ifndef __HVMLOADER_PCI_REGS_H__
- #define __HVMLOADER_PCI_REGS_H__
-
--#define PCI_VENDOR_ID 0x00 /* 16 bits */
--#define PCI_DEVICE_ID 0x02 /* 16 bits */
--#define PCI_COMMAND 0x04 /* 16 bits */
--#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
--#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
--#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
--#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
--#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
--#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
--#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
--#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
--#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
--#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
-+#define PCI_VENDOR_ID 0x00 /* 16 bits */
-+#define PCI_DEVICE_ID 0x02 /* 16 bits */
-+#define PCI_COMMAND 0x04 /* 16 bits */
-+#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */
-+#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */
-+#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */
-+#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */
-+#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */
-+#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */
-+#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */
-+#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */
-+#define PCI_COMMAND_SERR 0x100 /* Enable SERR */
-+#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */
- #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
-
--#define PCI_STATUS 0x06 /* 16 bits */
--#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
--#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
--#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
--#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
--#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
--#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
--#define PCI_STATUS_DEVSEL_FAST 0x000
--#define PCI_STATUS_DEVSEL_MEDIUM 0x200
--#define PCI_STATUS_DEVSEL_SLOW 0x400
--#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
--#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
--#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
--#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
--#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
-+#define PCI_STATUS 0x06 /* 16 bits */
-+#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */
-+#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */
-+#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
-+#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
-+#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
-+#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
-+#define PCI_STATUS_DEVSEL_FAST 0x000
-+#define PCI_STATUS_DEVSEL_MEDIUM 0x200
-+#define PCI_STATUS_DEVSEL_SLOW 0x400
-+#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
-+#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
-+#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
-+#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
-+#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
-
--#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
--#define PCI_REVISION_ID 0x08 /* Revision ID */
--#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
--#define PCI_CLASS_DEVICE 0x0a /* Device class */
-+#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
-+#define PCI_REVISION_ID 0x08 /* Revision ID */
-+#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */
-+#define PCI_CLASS_DEVICE 0x0a /* Device class */
-
--#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
--#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
--#define PCI_HEADER_TYPE 0x0e /* 8 bits */
--#define PCI_HEADER_TYPE_NORMAL 0
--#define PCI_HEADER_TYPE_BRIDGE 1
--#define PCI_HEADER_TYPE_CARDBUS 2
-+#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
-+#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
-+#define PCI_HEADER_TYPE 0x0e /* 8 bits */
-+#define PCI_HEADER_TYPE_NORMAL 0
-+#define PCI_HEADER_TYPE_BRIDGE 1
-+#define PCI_HEADER_TYPE_CARDBUS 2
-
--#define PCI_BIST 0x0f /* 8 bits */
--#define PCI_BIST_CODE_MASK 0x0f /* Return result */
--#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
--#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
-+#define PCI_BIST 0x0f /* 8 bits */
-+#define PCI_BIST_CODE_MASK 0x0f /* Return result */
-+#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */
-+#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */
-
- /*
- * Base addresses specify locations in memory or I/O space.
-@@ -71,38 +71,38 @@
- * 0xffffffff to the register, and reading it back. Only
- * 1 bits are decoded.
- */
--#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
--#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
--#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
--#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
--#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
--#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
--#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
--#define PCI_BASE_ADDRESS_SPACE_IO 0x01
--#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
--#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
--#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
--#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
--#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
--#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
--#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
--#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
-+#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
-+#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */
-+#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */
-+#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */
-+#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */
-+#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */
-+#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */
-+#define PCI_BASE_ADDRESS_SPACE_IO 0x01
-+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00
-+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
-+#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */
-+#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */
-+#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */
-+#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */
-+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
-+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL)
- /* bit 1 is reserved if address_space = 1 */
-
- /* Header type 0 (normal devices) */
--#define PCI_CARDBUS_CIS 0x28
--#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
--#define PCI_SUBSYSTEM_ID 0x2e
--#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
--#define PCI_ROM_ADDRESS_ENABLE 0x01
--#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
-+#define PCI_CARDBUS_CIS 0x28
-+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
-+#define PCI_SUBSYSTEM_ID 0x2e
-+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
-+#define PCI_ROM_ADDRESS_ENABLE 0x01
-+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
-
--#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
-+#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
-
- /* 0x35-0x3b are reserved */
--#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
--#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
--#define PCI_MIN_GNT 0x3e /* 8 bits */
--#define PCI_MAX_LAT 0x3f /* 8 bits */
-+#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */
-+#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */
-+#define PCI_MIN_GNT 0x3e /* 8 bits */
-+#define PCI_MAX_LAT 0x3f /* 8 bits */
-
- #endif /* __HVMLOADER_PCI_REGS_H__ */
-diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h
---- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100
-+++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100
-@@ -32,157 +32,157 @@
- between 0xf0000 and 0xfffff.
- */
- struct smbios_entry_point {
-- char anchor_string[4];
-- uint8_t checksum;
-- uint8_t length;
-- uint8_t smbios_major_version;
-- uint8_t smbios_minor_version;
-- uint16_t max_structure_size;
-- uint8_t entry_point_revision;
-- uint8_t formatted_area[5];
-- char intermediate_anchor_string[5];
-- uint8_t intermediate_checksum;
-- uint16_t structure_table_length;
-- uint32_t structure_table_address;
-- uint16_t number_of_structures;
-- uint8_t smbios_bcd_revision;
-+ char anchor_string[4];
-+ uint8_t checksum;
-+ uint8_t length;
-+ uint8_t smbios_major_version;
-+ uint8_t smbios_minor_version;
-+ uint16_t max_structure_size;
-+ uint8_t entry_point_revision;
-+ uint8_t formatted_area[5];
-+ char intermediate_anchor_string[5];
-+ uint8_t intermediate_checksum;
-+ uint16_t structure_table_length;
-+ uint32_t structure_table_address;
-+ uint16_t number_of_structures;
-+ uint8_t smbios_bcd_revision;
- } __attribute__ ((packed));
-
- /* This goes at the beginning of every SMBIOS structure. */
- struct smbios_structure_header {
-- uint8_t type;
-- uint8_t length;
-- uint16_t handle;
-+ uint8_t type;
-+ uint8_t length;
-+ uint16_t handle;
- } __attribute__ ((packed));
-
- /* SMBIOS type 0 - BIOS Information */
- struct smbios_type_0 {
-- struct smbios_structure_header header;
-- uint8_t vendor_str;
-- uint8_t version_str;
-- uint16_t starting_address_segment;
-- uint8_t release_date_str;
-- uint8_t rom_size;
-- uint8_t characteristics[8];
-- uint8_t characteristics_extension_bytes[2];
-- uint8_t major_release;
-- uint8_t minor_release;
-- uint8_t embedded_controller_major;
-- uint8_t embedded_controller_minor;
-+ struct smbios_structure_header header;
-+ uint8_t vendor_str;
-+ uint8_t version_str;
-+ uint16_t starting_address_segment;
-+ uint8_t release_date_str;
-+ uint8_t rom_size;
-+ uint8_t characteristics[8];
-+ uint8_t characteristics_extension_bytes[2];
-+ uint8_t major_release;
-+ uint8_t minor_release;
-+ uint8_t embedded_controller_major;
-+ uint8_t embedded_controller_minor;
- } __attribute__ ((packed));
-
- /* SMBIOS type 1 - System Information */
- struct smbios_type_1 {
-- struct smbios_structure_header header;
-- uint8_t manufacturer_str;
-- uint8_t product_name_str;
-- uint8_t version_str;
-- uint8_t serial_number_str;
-- uint8_t uuid[16];
-- uint8_t wake_up_type;
-- uint8_t sku_str;
-- uint8_t family_str;
-+ struct smbios_structure_header header;
-+ uint8_t manufacturer_str;
-+ uint8_t product_name_str;
-+ uint8_t version_str;
-+ uint8_t serial_number_str;
-+ uint8_t uuid[16];
-+ uint8_t wake_up_type;
-+ uint8_t sku_str;
-+ uint8_t family_str;
- } __attribute__ ((packed));
-
- /* SMBIOS type 3 - System Enclosure */
- struct smbios_type_3 {
-- struct smbios_structure_header header;
-- uint8_t manufacturer_str;
-- uint8_t type;
-- uint8_t version_str;
-- uint8_t serial_number_str;
-- uint8_t asset_tag_str;
-- uint8_t boot_up_state;
-- uint8_t power_supply_state;
-- uint8_t thermal_state;
-- uint8_t security_status;
-+ struct smbios_structure_header header;
-+ uint8_t manufacturer_str;
-+ uint8_t type;
-+ uint8_t version_str;
-+ uint8_t serial_number_str;
-+ uint8_t asset_tag_str;
-+ uint8_t boot_up_state;
-+ uint8_t power_supply_state;
-+ uint8_t thermal_state;
-+ uint8_t security_status;
- } __attribute__ ((packed));
-
- /* SMBIOS type 4 - Processor Information */
- struct smbios_type_4 {
-- struct smbios_structure_header header;
-- uint8_t socket_designation_str;
-- uint8_t processor_type;
-- uint8_t processor_family;
-- uint8_t manufacturer_str;
-- uint32_t cpuid[2];
-- uint8_t version_str;
-- uint8_t voltage;
-- uint16_t external_clock;
-- uint16_t max_speed;
-- uint16_t current_speed;
-- uint8_t status;
-- uint8_t upgrade;
-+ struct smbios_structure_header header;
-+ uint8_t socket_designation_str;
-+ uint8_t processor_type;
-+ uint8_t processor_family;
-+ uint8_t manufacturer_str;
-+ uint32_t cpuid[2];
-+ uint8_t version_str;
-+ uint8_t voltage;
-+ uint16_t external_clock;
-+ uint16_t max_speed;
-+ uint16_t current_speed;
-+ uint8_t status;
-+ uint8_t upgrade;
- } __attribute__ ((packed));
-
- /* SMBIOS type 11 - OEM Strings */
- struct smbios_type_11 {
-- struct smbios_structure_header header;
-- uint8_t count;
-+ struct smbios_structure_header header;
-+ uint8_t count;
- } __attribute__ ((packed));
-
- /* SMBIOS type 16 - Physical Memory Array
- * Associated with one type 17 (Memory Device).
- */
- struct smbios_type_16 {
-- struct smbios_structure_header header;
-- uint8_t location;
-- uint8_t use;
-- uint8_t error_correction;
-- uint32_t maximum_capacity;
-- uint16_t memory_error_information_handle;
-- uint16_t number_of_memory_devices;
-+ struct smbios_structure_header header;
-+ uint8_t location;
-+ uint8_t use;
-+ uint8_t error_correction;
-+ uint32_t maximum_capacity;
-+ uint16_t memory_error_information_handle;
-+ uint16_t number_of_memory_devices;
- } __attribute__ ((packed));
-
- /* SMBIOS type 17 - Memory Device
- * Associated with one type 19
- */
- struct smbios_type_17 {
-- struct smbios_structure_header header;
-- uint16_t physical_memory_array_handle;
-- uint16_t memory_error_information_handle;
-- uint16_t total_width;
-- uint16_t data_width;
-- uint16_t size;
-- uint8_t form_factor;
-- uint8_t device_set;
-- uint8_t device_locator_str;
-- uint8_t bank_locator_str;
-- uint8_t memory_type;
-- uint16_t type_detail;
-+ struct smbios_structure_header header;
-+ uint16_t physical_memory_array_handle;
-+ uint16_t memory_error_information_handle;
-+ uint16_t total_width;
-+ uint16_t data_width;
-+ uint16_t size;
-+ uint8_t form_factor;
-+ uint8_t device_set;
-+ uint8_t device_locator_str;
-+ uint8_t bank_locator_str;
-+ uint8_t memory_type;
-+ uint16_t type_detail;
- } __attribute__ ((packed));
-
- /* SMBIOS type 19 - Memory Array Mapped Address */
- struct smbios_type_19 {
-- struct smbios_structure_header header;
-- uint32_t starting_address;
-- uint32_t ending_address;
-- uint16_t memory_array_handle;
-- uint8_t partition_width;
-+ struct smbios_structure_header header;
-+ uint32_t starting_address;
-+ uint32_t ending_address;
-+ uint16_t memory_array_handle;
-+ uint8_t partition_width;
- } __attribute__ ((packed));
-
- /* SMBIOS type 20 - Memory Device Mapped Address */
- struct smbios_type_20 {
-- struct smbios_structure_header header;
-- uint32_t starting_address;
-- uint32_t ending_address;
-- uint16_t memory_device_handle;
-- uint16_t memory_array_mapped_address_handle;
-- uint8_t partition_row_position;
-- uint8_t interleave_position;
-- uint8_t interleaved_data_depth;
-+ struct smbios_structure_header header;
-+ uint32_t starting_address;
-+ uint32_t ending_address;
-+ uint16_t memory_device_handle;
-+ uint16_t memory_array_mapped_address_handle;
-+ uint8_t partition_row_position;
-+ uint8_t interleave_position;
-+ uint8_t interleaved_data_depth;
- } __attribute__ ((packed));
-
- /* SMBIOS type 32 - System Boot Information */
- struct smbios_type_32 {
-- struct smbios_structure_header header;
-- uint8_t reserved[6];
-- uint8_t boot_status;
-+ struct smbios_structure_header header;
-+ uint8_t reserved[6];
-+ uint8_t boot_status;
- } __attribute__ ((packed));
-
- /* SMBIOS type 127 -- End-of-table */
- struct smbios_type_127 {
-- struct smbios_structure_header header;
-+ struct smbios_structure_header header;
- } __attribute__ ((packed));
-
- #endif /* SMBIOS_TYPES_H */
-diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c
---- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100
-+++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100
-@@ -125,11 +125,11 @@
-
- int strncmp(const char *s1, const char *s2, uint32_t n)
- {
-- uint32_t ctr;
-- for (ctr = 0; ctr < n; ctr++)
-- if (s1[ctr] != s2[ctr])
-- return (int)(s1[ctr] - s2[ctr]);
-- return 0;
-+ uint32_t ctr;
-+ for (ctr = 0; ctr < n; ctr++)
-+ if (s1[ctr] != s2[ctr])
-+ return (int)(s1[ctr] - s2[ctr]);
-+ return 0;
- }
-
- void *memcpy(void *dest, const void *src, unsigned n)
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 209d937f8e7b..ccc822a3ea28 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -3,16 +3,13 @@
xen
- johneed@hotmail.com
+ idella4@gentoo.org
Ian 'idella4' Delaney
- Proxy maintainer