security version bump, bug 530182
authorYixun Lan <dlan@gentoo.org>
Wed, 26 Nov 2014 03:30:10 +0000 (03:30 +0000)
committerYixun Lan <dlan@gentoo.org>
Wed, 26 Nov 2014 03:30:10 +0000 (03:30 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

app-emulation/xen-tools/ChangeLog
app-emulation/xen-tools/Manifest
app-emulation/xen-tools/xen-tools-4.3.3-r2.ebuild [moved from app-emulation/xen-tools/xen-tools-4.4.1-r1.ebuild with 79% similarity]
app-emulation/xen-tools/xen-tools-4.4.1-r4.ebuild [moved from app-emulation/xen-tools/xen-tools-4.4.1-r2.ebuild with 92% similarity]
app-emulation/xen/ChangeLog
app-emulation/xen/Manifest
app-emulation/xen/xen-4.2.5-r2.ebuild [new file with mode: 0644]
app-emulation/xen/xen-4.3.3-r2.ebuild [new file with mode: 0644]
app-emulation/xen/xen-4.4.1-r3.ebuild [new file with mode: 0644]

index f9bd2045fc22a03710614ab48e956e1ed559065c..58fe3ce10734df078b6a68e0b203593fe7134763 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.266 2014/11/06 23:00:32 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.267 2014/11/26 03:25:14 dlan Exp $
+
+*xen-tools-4.4.1-r4 (26 Nov 2014)
+*xen-tools-4.3.3-r2 (26 Nov 2014)
+
+  26 Nov 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.3.3-r2.ebuild,
+  -xen-tools-4.4.1-r1.ebuild, -xen-tools-4.4.1-r2.ebuild,
+  +xen-tools-4.4.1-r4.ebuild:
+  security version bump, bug 530182
 
 *xen-tools-4.4.1-r3 (06 Nov 2014)
 
index f9af11936417eb08752517b6942931affef455de..9a2aa98482ce5d85142431ada1fbd86a83e55370 100644 (file)
@@ -22,34 +22,35 @@ DIST seabios-1.7.3.1.tar.gz 463801 SHA256 e1f5845c3fa01a9280421d587dcd866273d5d6
 DIST xen-4.2.5-upstream-patches-0.tar.xz 5380 SHA256 e1f2afeb801eb2f4905597cc819c05c7cfcfddb3f6a3c27599bbfbacca204117 SHA512 52f370d0606d3da6d058dee70016699ef25fe5ea0910a6681cf9ecd0f34396462361faffa1e16d0456bf1a08e4cfbde847535b45e5592c4f47e872868be89b60 WHIRLPOOL 4630bb386c70eb4317e1c3bc3db4e8c9b9b03fd6bed5f53f325d6c78110b06d13cad39371d5ddea16a2b8da0ec17a08bcb497999d5a31e5e6877c1c8800fe9fd
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.3.3-upstream-patches-0.tar.xz 7536 SHA256 b62613ef4aaf4978e25ffba11493cd01eb7515e4cfb13326bec7c52726e4acb4 SHA512 c7a1a421439455098bdf7c3561b3b932251a950534f40dcca0cbbf51854e379b997a6d0efdfc42389cddb8c8d0fd8e9215dc5c1d273a87bd903d0ce8d02cd609 WHIRLPOOL 6377a962c3ce07a8f23d58b89f0b0746cfd10db244162da6eb3a049b9098bacf621d9070f0358fae91f072cc72b2f6661c7b24b70de67527910f351b4278b0b0
+DIST xen-4.3.3-upstream-patches-1.tar.xz 27356 SHA256 f1654f9955ef7e2b2ca7cfe03f452aa19453dc592f976fbc2c6b3e993606045c SHA512 c46a2ca7082223d9345ac49bf4ef5e5f02f338c0e4c406083e81c707210b505965cf1cd5a84b0fbb2abcf7e9973acdb85c05068c0c0310965a177d63bbed2076 WHIRLPOOL e937b24761d536e7d71982c872cbb346459ba627cabf3f792c728985655a6f3c0e65305807833f2c9a2ca5eef7f819dc214c336131e9dff046ef5152d405a491
 DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec
 DIST xen-4.4.1-upstream-patches-1.tar.xz 12472 SHA256 96bdb8696bca1de9b7b7963dbfe6d60cfb9db2751a5aa89a1abd57c48faa811d SHA512 a8c3a8c013571eebd12b8a633c3a4988d32579af693951883c8d81030d9bde0368cd8b8420c11f76c46f004c8651e94c2554959675632bf7db50b75bdbfc4fb6 WHIRLPOOL 7b3839c09481511e5482042510b5440496fb3096d965ed1c74aaf2288ad16d805fc0327933de3e56918e9e92f251d180ea4913b4a59be270530f4ec54acb5f02
+DIST xen-4.4.1-upstream-patches-2.tar.xz 32688 SHA256 da8e3e2556a81a60b3eaf9047766c5161b719881eee747e32e927887949d6792 SHA512 03c986bc111410106ac67a35dc25b8dcb59ba39d8983e4a2496b1bc810afe10ffa67bc55043d931f9589155ce999724a17460a33ec426238cea400e71839b0a2 WHIRLPOOL ef63771910ff8c3f7d12430627a6292ae9998f38ca6470032a5d4ca4044e82f74bb07af568f05310d357a53ddd4e6027ab69eb4d43f65a0a98390b79e955c148
 DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf
 DIST xen-gentoo-patches-0.tar.xz 22240 SHA256 cfe809b2ca278a4ad6771a59ea5bf4848423e5eb5c72c2f3092163c772774e3c SHA512 05c3416859e24b6704e4cf3442fe20411e78a63689d20f97dfd228a15a7e5bb6cf0c4310278ef6cb15a37bc5e07933137ffa17ccb0a8b7096fc45f3a1c16ba90 WHIRLPOOL ea1c3a4679368bcc37f4638400e91f773126a43f6c180084cb8c8f737d9bdae476d67e310453ac3b10e3fe71a0e2c760906ad707234ee6933c0963d6f3c7f061
-DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
 DIST xen-gentoo-patches-3.tar.xz 23364 SHA256 66e37bc63376ac9aa9c8c9b16d7a154d3fb8c9906f963bb32f3d7baec6c95c68 SHA512 20b6bcede882b454bd84d349b0b70bf7e7150afb25ff89718f2feb938b120bd051547b7c129e58656e5281b39263de29bc2ed0510070fcfc2297110f0a597b4d WHIRLPOOL 293b1db1061e5af0f4f6e5c4d102d2ea8203539ad17adec3545ef35184ffae7d5c3f7a99dc5c367b9ad84b39aa6fa9624598620bdeb308c08ccf03b56b379e90
 DIST xen-ovmf-patches-0.tar.xz 4356 SHA256 cd192a98114e534ce7454dc7ea45a42cea7ca83899d01fc8d695e2b110fdeaaf SHA512 03b844040ebad1a18d759418b0107d56feb9b8095291b7da1d36eb3409041764ad4bfd87679176b820221180e1038f6fad4314e8ad877096c052505de6339cf8 WHIRLPOOL e5c0aca3c786d905ad13f4d58a3b9b78260350df3dbe769ea6b66ac409e25ea0a368f9554c9da9b1a3f6f01ea1540038893b496fa5e637b18007076f8d305ee6
 EBUILD xen-tools-4.2.5-r1.ebuild 10705 SHA256 464b696bfa55e962dcb87526ad26b5fe2872bac16bd2f2d654524aa3421c17ce SHA512 e5a0bc2ad064210ae025ad0738c67d35fa4f2ec0d1e83ae322d433a2d49adff55aa44e5007587cce0b8f5c440b4d008ad66a0016a4794affa448d9c257650969 WHIRLPOOL 05e3b7e28c121bd7f7a902d4b120b4e4ebd213d952a5805b0b97f497236d3ecc7ca247049c14d39b55d473b06cc62739b758bd137ee6a9d10f07c36b3b97c793
 EBUILD xen-tools-4.3.3-r1.ebuild 12096 SHA256 5149ca998ad89f3c21fb3a39b0052ea9688b8a4dae91669319bf5d4c7f4fe5b2 SHA512 d237bac39cd7c0644bab195b84640065164b46e6de2f90366e6d60a215ea878ddce2df00f55a3cab11091f5cc056cae98d9fb21231f0d3d9419236957d9f42b7 WHIRLPOOL b1d15bc0933167c2da55b13bd75ac1f20e0c37d145a52bd8989e596f7ba6607f609e10183fe35712232a644b01ad07caf25a58bf07058c786bd428d76989e3a4
-EBUILD xen-tools-4.4.1-r1.ebuild 12573 SHA256 cffbf81dc3eeb0fd2cea0f7dd7785b1aa4d8b0b8446c41e1967c597013f80f19 SHA512 bf1ddd769fd3a4f0e9288305d3d00801d5cb7f9ee0a2c4f4e0fa5491455185d1ebfda5bdd652a7dde497f7d4b76da71d095e16cf08bf9e475a1c2e81029464d9 WHIRLPOOL 76c5341f962b8741973461d5865e9221b834a93de4504c45fca9e16d34818633a5a306eb4f47142f0c1c111fce96eefd243a3befe033b4f233f402870a0139bf
-EBUILD xen-tools-4.4.1-r2.ebuild 12503 SHA256 1948afa7364e3f2a6e574dab65420040af32fc440bb63eb1e6d4607725f9fbc2 SHA512 6ed1febffb2ef2928a912aeb55ebd8dddfb1a23f8fa792f63ef6aa710854b4691a2081d3d41f953429e80ab6e7242da6e75270dd31260c2a67394b48930caa36 WHIRLPOOL 2bba682ba6a29ec4703a65ee37e6daddc2b15379e646797496b72510baf569758714550053f97e77774b0011080fdc73eaa838027d861c6b5d5d15dd311229f1
+EBUILD xen-tools-4.3.3-r2.ebuild 12097 SHA256 d371e2bac690ea1bc49ca8216ba0173bbc39f5a7c468843f1829f6984af0589c SHA512 87ff0e4bf29d6bf73f08bd4a9c1cec85150b46e07cd8bd4fb6c0b08be692b074f45e42b91fedcf31616c0c12b5bd7580de4a65013ee8fd0c1f8e2e8b24033e13 WHIRLPOOL a515162d367ec0e33ead3fd75ecf991afb49a1ee4edc4b956d0b3009a56c88da634dd52563c73f476a2cbac7fd8809fb30910da5865e3554e94a309e75a79917
 EBUILD xen-tools-4.4.1-r3.ebuild 13105 SHA256 fbebe4e0817bcaf93f4298c8143dfd55cf5b76a64a219b3b54c5464b247c1fdb SHA512 7aee0a081f9f64a66da55ed41371a52e449406b4c4a5c5f7fb21a17c9d8cdcbe0f888305b4a015e310fbd4118cdd7e84dbc105880d38791f5f0124b6589bf1e1 WHIRLPOOL c7215eb2e37de885e39ee428e114c5a84a626b10f11a9f733e5e541cc3673ed16a852f2fbdfbb9172f869e3253a735018a1ce011c3ce790a1fe6f854c6b0b6d9
-MISC ChangeLog 62689 SHA256 f40e73b286470a846e271f2dd9242dceee3f31f8ce1e8bba3cdcfbb8961df3ee SHA512 1551b656dfe50b736067f8ef89eb912391936da2383c6d445ddfb3eb9f3c98e7aafbfa5ed03d67afcf5627273e22f7e117fefc152f6ace14e015f0dbddf5cb80 WHIRLPOOL b4a837139509b1c5c4facd1904c7802397f8d92e3fd2f4802a421ceb9621a975b82725dc8adc025c424101fa52e7b8a3040358258a090e9d8fe93bac23c66695
+EBUILD xen-tools-4.4.1-r4.ebuild 13175 SHA256 464f54e18d8e0cd7f2feb212e6e69d8bd56b3e515a3cd7b15ecfdf30b36b5572 SHA512 e039381f994cdcbce029a9f1d8b6f57237c61fe179df5480e85761341cca178ca53be0c45b21994fe92ace699c37914b526cd84cd26536f40c986a709f432ddf WHIRLPOOL 4f16aa918870628e7923241258308a0f7fcb33b2b053ad6b1a0596c21ae2e0611a476bba9e94c18a771d642d516d473298815b66862a74effb7683d776915773
+MISC ChangeLog 62954 SHA256 07787e7505c9243c13bfc811c15a032a1252bd5c7289690372853133881d3094 SHA512 2dd3c669b64ccbcdfc2ad7c4ee68fcaa00ea3d3a5a84957c1e52671da9a0e2f817af49e1ab19a261737bf64a0b1e9cbc94c40d45c4017b68b281fba4a5f7efe6 WHIRLPOOL ed389102743810ec59aaa2643327db8ff84a60bd729c7ab7e5a8160e6839e698dd9c4f8bde564d778b505e9b0d532dceb0f2a3155a2eed83d5f591627ee762cd
 MISC metadata.xml 1016 SHA256 c308885b5aaa9733dcc866837e1847a89ef6085cf360a32a819cc38436d3569f SHA512 d93403690acb20d330e3af8e76b0a63daf69abce63f41e2edb7268158fafa15aa2c3f58fa1b6ec5f4667e55262685840bd1e47c12b2dfb95f702a7ecf7926390 WHIRLPOOL f02be8f37834b7d01328f99664268a0f6a47876c520f4bb36690b70c436a65e1a34cc6fed9e3429a804f1668c8e6c379bff39bf7375842d0b6c1efe3c01f756d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUW/2hAAoJEJIMDbyqvv1VvyEQAIRWZh/ZZWFdKLZyB+DoQXHX
-9mBRJBwHyka3jh7rxAR/+4Jb7jz4tlSk3Ih3X1FQSWoJLjbpHjlszz7xEevpSZ4J
-aehtMY3mWhCmXiKRH9BLB6cOjOHxtR82FCtY3gJmxwN7FDDjT0WtkLLvw9ZphRkb
-kecsClxJnCkrmlSVqP02JAeg3zozHmCJXKzfYJWeckwIJfvmvKvxAGu0bI48zw6Y
-KgbG9IOBA9uAMqWfWuQMWzRAlI0JsyW30PE3YGZvO+9Po71qHMPF7xi8M8ox2J4e
-JmpaopMojuu0kgVV92LMbIlvyVDFQQxleW9T8Q/oBO9fiCs8eZRY51LNZEleixJg
-zU2uzEewgghzgvalamNobCg9g8MoGBMPTfJds6OmurXvoYcgD6JU48cWzqAlF7wx
-Swp9F3snH84ilbXCgJDhTuv+gPGa8rQpK1FDBAVNHBcLd1DtDqpfW9e5Kn3kI77V
-hO6gwSOJ31tB+eilznRC1kRxAOftYhi7ljURgJufkANUmUkBrhYYQrGlqtgFVKkm
-D1VQJcaLK7+2n8+Ul3xoLhWmGK8vZC16mWzL34OuKheoED1gjLi2dPD6zizYupeN
-gjE/eQ1ieULykMjktImt8JLBp5kS6Zqvpyuipgpx6rEp0X1S39RqnD9MSw1AxEr3
-1KE0jCsI8N2MURtWL3b9
-=cLYb
+iQIcBAEBCAAGBQJUdUgtAAoJEJIMDbyqvv1V3IIP/ROckVxvVQorEvTz/LKCWna8
+3UQHVhbqP7Pu7zQY0/46obIwULGRyxLULh12t6hXJBntr2DeinKxK9vpDyfHDsGP
+o/BkEMhOYaKI324h/YcqcsITq/cognInkOq7aa8E6FTqOM6EJ0sFsbpXSsm6aNT+
+eCnEZO3JBxO5ZaUYFYivrxadvdTtjqI3ht6E7nyKsmmPPGUiE596BvvtHruTt6Kh
+epTTHRx2gwW/3/PII6O7fzPUX6wMnzUIERjafHaAiN6mJpDE1jPmwwNnn6UhMxxv
+zoW+On/vxyzoFC4pdMT1TOdAxt+eFlav/fPAga+Lf5MlOHK8f0h0IfCb8nPc/MCq
+0TNa1Inck7iJiTmzMiUG6TRLp4NB8v3DXVdCpRSb0axO1VgAoaKY2BktHQ0COZQK
+eaHy2tF0U3NgTRgirt1SA18i6BX4ah8snoMq3D2GZ6h0QTqi72iyc2QpP0aJ2V+l
+Q8BvT4ixcBObYmxda1//Bs4jWR4etcy6rJEMBrF03+aqlwyIzUotdYfyO/bZQji3
+xqDGY+hb6qkx/l9TGMUg0CvVjxtX6pONmnwBExdNCR9hRLy0P7y9EQ+WpW0q73TV
+RqfWuOsprtyEYP1uAuDrLui3+2f7MPb/I5WoB+gwfZoMwt7pYPX7ZmehlWqL8Ibp
+RbX1dEcTeFkWb2XrRvZ9
+=aRHn
 -----END PGP SIGNATURE-----
similarity index 79%
rename from app-emulation/xen-tools/xen-tools-4.4.1-r1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.3.3-r2.ebuild
index 0ddc601486e75b5001d416f26cac31c30ff2538c..6297575e2e1e11a66d3a4d3546a18e91204281ef 100644 (file)
@@ -1,12 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1-r1.ebuild,v 1.1 2014/10/10 03:05:45 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3-r2.ebuild,v 1.1 2014/11/26 03:25:14 dlan Exp $
 
 EAPI=5
 
-MY_PV=${PV/_/-}
-
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='xml,threads'
 
 if [[ $PV == *9999 ]]; then
@@ -16,25 +14,25 @@ if [[ $PV == *9999 ]]; then
        S="${WORKDIR}/${REPO}"
        live_eclass="mercurial"
 else
-       KEYWORDS="~amd64 ~arm -x86"
+       KEYWORDS="~amd64 -x86"
        UPSTREAM_VER=1
        # xen-tools's gentoo patches tarball
        GENTOO_VER=0
        # xen-tools's gentoo patches version which apply to this specific ebuild
        GENTOO_GPV=0
-       SEABIOS_VER=1.7.3.1
+       SEABIOS_VER=1.7.1-stable-xen
 
        [[ -n ${UPSTREAM_VER} ]] && \
-               UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+               UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
        [[ -n ${GENTOO_VER} ]] && \
-               GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+               GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
 
-       SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
        http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
        http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
-       ${UPSTRAM_PATCHSET_URI}
+       ${UPSTREAM_PATCHSET_URI}
        ${GENTOO_PATCHSET_URI}"
-       S="${WORKDIR}/xen-${MY_PV}"
+       S="${WORKDIR}/xen-${PV}"
 fi
 
 inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
@@ -45,39 +43,32 @@ DOCS=( README docs/README.xen-bugtool )
 
 LICENSE="GPL-2"
 SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make 
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu system-seabios"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios"
 
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+REQUIRED_USE="hvm? ( qemu )
        ${PYTHON_REQUIRED_USE}
-       pygrub? ( python )
-       qemu? ( !system-qemu )"
+       pygrub? ( python )"
 
-COMMON_DEPEND="
-       dev-libs/lzo:2
+DEPEND="dev-libs/lzo:2
        dev-libs/glib:2
        dev-libs/yajl
-       dev-libs/libaio
        dev-libs/libgcrypt:0
-       sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
        dev-python/lxml[${PYTHON_USEDEP}]
        pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+       sys-libs/zlib
+       sys-power/iasl
+       system-seabios? ( sys-firmware/seabios )
+       sys-firmware/ipxe
        hvm? ( media-libs/libsdl )
        ${PYTHON_DEPS}
        api? ( dev-libs/libxml2
                net-misc/curl )
        pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-       arm? ( >=sys-apps/dtc-1.4.0 )
-       !arm? ( sys-devel/bin86
-               system-seabios? ( sys-firmware/seabios )
-               sys-firmware/ipxe
-               sys-devel/dev86
-               sys-power/iasl )
+       sys-devel/bin86
+       sys-devel/dev86
        dev-lang/perl
        app-misc/pax-utils
        dev-python/markdown[${PYTHON_USEDEP}]
@@ -97,12 +88,9 @@ DEPEND="${COMMON_DEPEND}
        hvm? ( x11-proto/xproto
                !net-libs/libiscsi )
        qemu? ( x11-libs/pixman )
-       system-qemu? ( app-emulation/qemu[xen] )
        ocaml? ( dev-ml/findlib
                >=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-       sys-apps/iproute2
+RDEPEND="sys-apps/iproute2
        net-misc/bridge-utils
        screen? (
                app-misc/screen
@@ -112,8 +100,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader
-       usr/share/qemu-xen/qemu/s390-ccw.img"
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
 
 RESTRICT="test"
 
@@ -128,6 +115,12 @@ pkg_setup() {
                export "CONFIG_GCRYPT=y"
        fi
 
+       if use qemu; then
+               export "CONFIG_IOEMU=y"
+       else
+               export "CONFIG_IOEMU=n"
+       fi
+
        if [[ -z ${XEN_TARGET_ARCH} ]] ; then
                if use x86 && use amd64; then
                        die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -135,14 +128,10 @@ pkg_setup() {
                        export XEN_TARGET_ARCH="x86_32"
                elif use amd64 ; then
                        export XEN_TARGET_ARCH="x86_64"
-               elif use arm; then
-                       export XEN_TARGET_ARCH="arm32"
                else
                        die "Unsupported architecture!"
                fi
        fi
-       #bug 472438
-       export BASH_COMPLETION_DIR=/usr/share/bash-completion
 }
 
 src_prepare() {
@@ -165,6 +154,10 @@ src_prepare() {
                done
        fi
 
+       # Bug 496708
+       use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
+
+       # Bug 478064
        mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
        mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
@@ -172,16 +165,6 @@ src_prepare() {
        ln -s seabios-dir-remote seabios-dir || die
        popd > /dev/null
 
-       # Fix texi2html build error with new texi2html, qemu.doc.html
-       sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-                -i tools/firmware/Makefile || die
-
-       # Drop .config, fixes to gcc-4.6
-       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
-
        # 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"
@@ -205,7 +188,9 @@ src_prepare() {
                sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
        fi
 
+       # Disable hvm support on systems that don't support x86_32 binaries.
        if ! use hvm; then
+               sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
                sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
        # Bug 351648
        elif ! use x86 && ! has x86 $(get_all_abis); then
@@ -216,30 +201,27 @@ src_prepare() {
 
        # Don't bother with qemu, only needed for fully virtualised guests
        if ! use qemu; then
-               sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+               sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+               sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
        fi
 
-       # Bug 472438
-       sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
+       # Reset bash completion dir; Bug 472438
+       sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
                -i Config.mk || die
+       sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+       use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
+       use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+       sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+                -i tools/firmware/Makefile || die
 
        # xencommons, Bug #492332, sed lighter weight than patching
        sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
                -i tools/hotplug/Linux/init.d/xencommons || die
 
-       # respect multilib, usr/lib/libcacard.so.0.0.0
-       sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-               -i tools/qemu-xen/configure || die
-
-       #bug 518136, don't build 32bit exactuable for nomultilib profile
-       if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-               sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-       fi
-
-       # Bug 477884, 518136
-       if [[ "${ARCH}" == 'amd64' ]]; then
-               sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die
-       fi
+       # Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
+       sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
+               -i tools/libxl/libxl_bootloader.c || die
 
        # fix QA warning, create /var/run/, /var/lock dynamically
        sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
@@ -256,20 +238,20 @@ src_prepare() {
 }
 
 src_configure() {
-       local myconf="--prefix=/usr \
-               --libdir=/usr/$(get_libdir) \
-               --disable-werror \
-               --disable-xen \
-               --enable-tools \
-               --enable-docs \
-               --enable-qemu-traditional \
-               $(use_with system-qemu) \
-               $(use_enable pam) \
-               $(use_enable api xenapi) \
-               $(use_enable ocaml ocamltools) \
-               "
-       use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-       use qemu || myconf+=" --with-system-qemu"
+       local myconf="--prefix=/usr --disable-werror"
+
+       if use ocaml
+       then
+               myconf="${myconf} $(use_enable ocaml ocamltools)"
+       else
+               myconf="${myconf} --disable-ocamltools"
+       fi
+
+       if ! use pam
+       then
+               myconf="${myconf} --disable-pam"
+       fi
+
        econf ${myconf}
 }
 
@@ -315,9 +297,6 @@ src_install() {
                -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
                -i tools/examples/xl.conf  || die
 
-       # Reset bash completion dir; Bug 472438
-       mv "${D}"bash-completion "${D}"usr/share/ || die
-
        if use doc; then
                emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
 
@@ -347,6 +326,12 @@ src_install() {
                keepdir /var/log/xen-consoles
        fi
 
+       # Move files built with use qemu, Bug #477884
+       if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+               mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+               mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
+       fi
+
        # For -static-libs wrt Bug 384355
        if ! use static-libs; then
                rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
similarity index 92%
rename from app-emulation/xen-tools/xen-tools-4.4.1-r2.ebuild
rename to app-emulation/xen-tools/xen-tools-4.4.1-r4.ebuild
index 37249937bd6704019433f3bc51fc8c584d8103d3..9e5a7bd33fbbc6dcea8bee8b5ae175d3d339f9d3 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1-r2.ebuild,v 1.1 2014/11/01 14:54:13 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1-r4.ebuild,v 1.1 2014/11/26 03:25:14 dlan Exp $
 
 EAPI=5
 
@@ -17,23 +17,31 @@ if [[ $PV == *9999 ]]; then
        live_eclass="mercurial"
 else
        KEYWORDS="~amd64 ~arm -x86"
-       UPSTREAM_VER=1
+       UPSTREAM_VER=2
        # xen-tools's gentoo patches tarball
-       GENTOO_VER=1
+       GENTOO_VER=3
        # xen-tools's gentoo patches version which apply to this specific ebuild
-       GENTOO_GPV=1
+       GENTOO_GPV=2
+       # xen-tools ovmf's patches
+       OVMF_VER=0
+
        SEABIOS_VER=1.7.3.1
+       OVMF_PV=20131208
 
        [[ -n ${UPSTREAM_VER} ]] && \
                UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
        [[ -n ${GENTOO_VER} ]] && \
                GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+       [[ -n ${OVMF_VER} ]] && \
+               OVMF_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
 
        SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
        http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
        http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+       http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
        ${UPSTRAM_PATCHSET_URI}
-       ${GENTOO_PATCHSET_URI}"
+       ${GENTOO_PATCHSET_URI}
+       ${OVMF_PATCHSET_URI}"
        S="${WORKDIR}/xen-${MY_PV}"
 fi
 
@@ -48,11 +56,12 @@ SLOT="0"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu system-seabios"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
 
 REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
        ${PYTHON_REQUIRED_USE}
        pygrub? ( python )
+       ovmf? ( hvm )
        qemu? ( !system-qemu )"
 
 COMMON_DEPEND="
@@ -163,9 +172,20 @@ src_prepare() {
                done
        fi
 
+       # Ovmf's patchset
+       if [[ -n ${OVMF_VER} ]]; then
+               pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+               EPATCH_OPTS="-p1" \
+                       epatch "${WORKDIR}"/patches-ovmf
+               popd > /dev/null
+       fi
+
        mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
        mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+       mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
        pushd tools/firmware/ > /dev/null
        ln -s seabios-dir-remote seabios-dir || die
        popd > /dev/null
@@ -261,12 +281,14 @@ src_configure() {
                --disable-xen \
                --enable-tools \
                --enable-docs \
-               --enable-qemu-traditional \
                $(use_with system-qemu) \
                $(use_enable pam) \
                $(use_enable api xenapi) \
+               $(use_enable ovmf) \
                $(use_enable ocaml ocamltools) \
                "
+       # disable qemu-traditional for arm, fail to build
+       use arm || myconf+=" --enable-qemu-traditional"
        use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
        use qemu || myconf+=" --with-system-qemu"
        econf ${myconf}
index 5ee23f850c0194da01938446e1c72bfb26c0a1c9..96a589f6fa2272bb27014806f48f851937faf25f 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.179 2014/10/15 01:32:01 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.180 2014/11/26 03:29:54 dlan Exp $
+
+*xen-4.4.1-r3 (26 Nov 2014)
+*xen-4.3.3-r2 (26 Nov 2014)
+*xen-4.2.5-r2 (26 Nov 2014)
+
+  26 Nov 2014; Yixun Lan <dlan@gentoo.org> +xen-4.2.5-r2.ebuild,
+  +xen-4.3.3-r2.ebuild, +xen-4.4.1-r3.ebuild:
+  security version bump, bug 530182
 
   15 Oct 2014; Yixun Lan <dlan@gentoo.org> -xen-4.2.4-r4.ebuild,
   -xen-4.2.4-r5.ebuild, -xen-4.2.5.ebuild, -xen-4.3.2-r4.ebuild,
index 0e87394ff4c12c03f3ed1c0c207a9a895b35f77d..29804e7aa809214572083f5e38c5997a03f508c5 100644 (file)
@@ -6,30 +6,36 @@ AUX xen-4.2-efi.patch 2216 SHA256 0886961e2656fe7e140dd0ac0e6620d4c14ef0796b8f88
 AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad
 AUX xen-4.4-efi.patch 1873 SHA256 096ae932f6f9387b8d5a837279c436173310f121e06ba356b7dded67d682ac7a SHA512 a448b72f679fa2e9d544d73bfb68d2deef646706917114a458c9c44a0338d46390ebffe8b671a30f057be9f15b8fb4246c574916e674b5bd314b6908e5e06c82 WHIRLPOOL 02ba29e135f85727a655ed674624a97c3bad40ddd00a0e194b64f5179b9e65c9f6831c902c754001551dc4fbc0a08ee52c075208551d72a65b2f93f7aef29698
 DIST xen-4.2.5-upstream-patches-0.tar.xz 5380 SHA256 e1f2afeb801eb2f4905597cc819c05c7cfcfddb3f6a3c27599bbfbacca204117 SHA512 52f370d0606d3da6d058dee70016699ef25fe5ea0910a6681cf9ecd0f34396462361faffa1e16d0456bf1a08e4cfbde847535b45e5592c4f47e872868be89b60 WHIRLPOOL 4630bb386c70eb4317e1c3bc3db4e8c9b9b03fd6bed5f53f325d6c78110b06d13cad39371d5ddea16a2b8da0ec17a08bcb497999d5a31e5e6877c1c8800fe9fd
+DIST xen-4.2.5-upstream-patches-1.tar.xz 12260 SHA256 82c3640b6c3f64767810a2db26fc7b96751e350989846679ab60a034a17202e1 SHA512 71998510a0a80069f7d0ab4e74e6ecc1e4a224df9a6c83af50fa7cf322e4d45f80366006fc004238e05def1084dc80e70221ae082833f29781f33a0b621bd303 WHIRLPOOL 034ac220e17025c41a969a1474bb0170eb5ec72b9c0dc8ef48208da01f380fbd2d969a7ae323b41e73156a90f06c0f90f16722581a79c232f7d0b9bd1509b0c0
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.3.3-upstream-patches-0.tar.xz 7536 SHA256 b62613ef4aaf4978e25ffba11493cd01eb7515e4cfb13326bec7c52726e4acb4 SHA512 c7a1a421439455098bdf7c3561b3b932251a950534f40dcca0cbbf51854e379b997a6d0efdfc42389cddb8c8d0fd8e9215dc5c1d273a87bd903d0ce8d02cd609 WHIRLPOOL 6377a962c3ce07a8f23d58b89f0b0746cfd10db244162da6eb3a049b9098bacf621d9070f0358fae91f072cc72b2f6661c7b24b70de67527910f351b4278b0b0
+DIST xen-4.3.3-upstream-patches-1.tar.xz 27356 SHA256 f1654f9955ef7e2b2ca7cfe03f452aa19453dc592f976fbc2c6b3e993606045c SHA512 c46a2ca7082223d9345ac49bf4ef5e5f02f338c0e4c406083e81c707210b505965cf1cd5a84b0fbb2abcf7e9973acdb85c05068c0c0310965a177d63bbed2076 WHIRLPOOL e937b24761d536e7d71982c872cbb346459ba627cabf3f792c728985655a6f3c0e65305807833f2c9a2ca5eef7f819dc214c336131e9dff046ef5152d405a491
 DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec
 DIST xen-4.4.1-upstream-patches-1.tar.xz 12472 SHA256 96bdb8696bca1de9b7b7963dbfe6d60cfb9db2751a5aa89a1abd57c48faa811d SHA512 a8c3a8c013571eebd12b8a633c3a4988d32579af693951883c8d81030d9bde0368cd8b8420c11f76c46f004c8651e94c2554959675632bf7db50b75bdbfc4fb6 WHIRLPOOL 7b3839c09481511e5482042510b5440496fb3096d965ed1c74aaf2288ad16d805fc0327933de3e56918e9e92f251d180ea4913b4a59be270530f4ec54acb5f02
+DIST xen-4.4.1-upstream-patches-2.tar.xz 32688 SHA256 da8e3e2556a81a60b3eaf9047766c5161b719881eee747e32e927887949d6792 SHA512 03c986bc111410106ac67a35dc25b8dcb59ba39d8983e4a2496b1bc810afe10ffa67bc55043d931f9589155ce999724a17460a33ec426238cea400e71839b0a2 WHIRLPOOL ef63771910ff8c3f7d12430627a6292ae9998f38ca6470032a5d4ca4044e82f74bb07af568f05310d357a53ddd4e6027ab69eb4d43f65a0a98390b79e955c148
 DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf
 EBUILD xen-4.2.5-r1.ebuild 4233 SHA256 b83c320ba293245068c8f761032d8d16c8dc4e280b0f07845ef53b6aa80dbfbd SHA512 3e6480af9ef5d7065d695f2f32fcba16e8c6f2a6e21d954233d421777e7f2868c218ad90580df1d70c4dbc12cf122dce9361d960cbdbfd8824b36d7cb36bca32 WHIRLPOOL d056e6b7d271c5a0ae57372043655296a704db4845a9f64d80ade6fadbe41e09aef5f720d11739343995a542bba8811591f66ca5822b81eb8c3f3d6f449d229b
+EBUILD xen-4.2.5-r2.ebuild 4236 SHA256 2fd139b5338f06fb6b34d1e3a9c03b84ef0250547432cab4e36d5a3f1890352e SHA512 d09f5468aac2b69819272ead53d6c34608935278fb559bfce5ec44c1f894601e2b7a6f2c2a5d32b3f2ee012ccdecba8ad1dd5a31b90c1f81ce08183d3364e856 WHIRLPOOL c87d68141d79ba583a17e778f87d3aa62d3949d28b2ebf8ad96a9598ebbf02884cb76327db94f1091e6c7d2267aaa02180556d1e740390f8dbd856655fd784dc
 EBUILD xen-4.3.3-r1.ebuild 4128 SHA256 2823aeeade1f2c0c1206c6e0d1e747a4fec3151b654b5f3af23f79ca9dd536e7 SHA512 3ce390b86314efb14932ffd01b5e8ee29ad5bb9747569de9639c19bc257bca0ffe0055e4f0f8dca7e59d9c954bc461f5e69af4949c57e8f7e7292a325a4b0a27 WHIRLPOOL 2f398e01c60cfcd5d3ba40ce82905992c62b1a95805a4f25962cf40cf67b39011759f0ec5376467081d500aa19557f549aee4890a7c4edc7c02baecd7271a539
+EBUILD xen-4.3.3-r2.ebuild 4130 SHA256 6905a070d9a75881833a1f3153921fad68970d5de32ba474e00fad4e89e3d55e SHA512 788f0efb7225d05a5a9c9cb18244cfd84c4b8c4207dcc9a9a137456641e27784582496081985951f57b028668a0d40da7fc4da97b1ac24b1cd9349c482c60d27 WHIRLPOOL 7101bfc5546ea88d9aedcd03ce2badd8fd6315474bd9d01358bcb83e88ec718ed4d3c0034dba4c8d7e6921ed0ac854b34342b936f1a4d85552b693f00b03645b
 EBUILD xen-4.4.1-r2.ebuild 4359 SHA256 d43ad43308ea88c3f3c96894cb1bfb9ca7a41a93feae6f4d346ff5aa2264ec53 SHA512 0173382ae88fa49218a10faf11915e2f8b8f5a65b39a444d31e273f3f08bf5ca241e3603d404ad6f8af53288a35da8414b7b724b08b7210fa6b1ac0adf312083 WHIRLPOOL bf401dc49c524f4845de4f9be4f3b1bdda546a5d71522fadc0bbcef91878d03b987d086c4cd901e11c711570f47688786ec88cf23e158cec1240bfad75754b43
-MISC ChangeLog 32902 SHA256 c6cb76eb057cde9f18ba0c009ebb7e517a6100a448225521d676d3d43315b132 SHA512 1f403843d6f144672624fcf0df4161ea786a747e08daddcdc96205251f46c52fcb333fb8abff4d07e2d9cd8fc146819327dcae1a3825565421b7d3267cb223dc WHIRLPOOL 5794b00d59a3f245f7be14b8773241686ac5980240fbff461e16831dbbd9708c05c09b03f94884fc40881c7e952a4d5dd891b7701a93cbb407f773309c243555
+EBUILD xen-4.4.1-r3.ebuild 4359 SHA256 b8332ce4ca470284f63e1bcba7f1bf83c234c0f3798aca84b8e009a4068d5d11 SHA512 46bbbcbdfd1c969a215b0cb2ce69b23c4068876586e4b3c89fefb1e8790eee763c3c954bfa809d8e4ec328a541a2a7b019af99d432c5eae646504902614135c9 WHIRLPOOL f6dac1669dc222cf1ef7714bc0f497705f4a15f4b62cbe7eb92bd5c85636571c2736a57195807d5b77e33e757755fccd205548aaa434247fa955cf3396d43fb0
+MISC ChangeLog 33135 SHA256 9993f3b02fed06d1ba6fafad589c17090af60530287c6b60dd0647e50aa8e48d SHA512 6f708d2e6fa7bc4e79ecbc037500801aba0b23c8eba8846e10422d72e5d5232ff66f27910989af4c1fc8681df5fa557117bf378c051559b4de47e047eb7b3cb4 WHIRLPOOL 644eaadc840f28cf55d737f78d61337c45974f233267d52392fd77581f5960be09476ee6ea35316617372e9ff83a339a3a04c909e649993da12763c63fcd1141
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUPc6cAAoJEJIMDbyqvv1VrVMP/0TaCHUefUpT0CTbutmbiqU3
-LCOOZsvIUh2tRRKsHZtb9drexJqTWIHLt2HXyE50Ne85U2pshDXp+kxgEY7bzdor
-P8BzRH1akph+3ox6lLXLAM6XX3K6kzWjtc+eHNRtbNn6AQ72y67D+WLMFt4lTC7W
-ZFmjRSxmRtZvTtjTA2z+Xaut5tT1MHaT4tN9cYzPq3QDmTG3n3KW1Tbh2N52FvVm
-9wQir2Iua3RSiWZwnv4c7qqP+cSEVvAz17P8nhb6tPZ/k+6H7xTbeU0GunujyH9C
-aLeAwpzSP//NTOhtPxQpqzAMLU59XewdbWyf4YsHJNTTnNrp0I4zoFApcJOb7GLL
-PwWjQMmm0DflS1EpL3N9vkB0RtVscQgveuto2f1E/g5tVO2781la+ixLPk1zTV6s
-X60EqLWAeevHLj2epxyTTOPraY6Ck5gmtL2beTVT7/f+Ffbiqy0cmeIhBOlPruzm
-Xi8I0/DT6LvVEtAYIaEPdRIizygIFRdIJrEsW4qDFkEQIt+S5nmpphkr10/PcIgW
-aRkjNY6NeZekhnkGGs5rVwBMTGWdqfpyypZe5ns1qcftcd9r4hg/V7JfqhCQczIf
-OjophkFG/oBawpvmiVjr66vgzvc8BKLazNoLsB48fX2gvt5+JUXy9pK20HLQRL5W
-DqSosJwkcfvXEo7V1AUo
-=kclL
+iQIcBAEBCAAGBQJUdUlAAAoJEJIMDbyqvv1V6xAP+wbgD9O1LtTZkFzZ9CukX8EI
+iD2X7YB+CtWfi9XXq+TXikRS4C2Y21aaRzOPs18opyuxPg92K8kMBGFxC6M7LYk1
+BxNmgas7WSGoo3BdOHpigNcmZmBoJkgnOkFZF0cfE413lVFQwq588jxnUFds0hJs
+mvit4yuC1lIHpkbz33fkALjOpG1GNxcT2Aleo/0fd96Egkb9w6ktNG2sQX2sX90w
+cI38I6klefdD+Y51iNdnGyAhLhSdvbmcd2bBrcjp7MP/P8DhvZGJtWe6b9ryblsE
+dLHXetYK3gYrLkYbWmRdiP69CTSJ6LVt1PkMaaIpopRVXfOQlYgP1O+GnkPCItv8
+Rj7qWzX1i/k1bsP8F4XZOdmL1gLnHPe6Q5ie9wOZdcSH9LcdBVTl6xllU//yhXFI
+FPIo1nS5Bq+KkOCRMBq13LLKmH9jLXMUAfZIVh7+qGBuT+hr6avX1KfW1sKc2DNg
+SGmMOEb21XmAbzh3GXCDUJA7yUgK7oy3W7IqWOyy/m+sU/GPWvXonm0ubUp5QQ/2
+3ya5OajB7B+sLxlVOfqdx2VJMLjZQgFWKiBZMd9k2fOICEIKPXOqeBzQaNY1IkpR
+CeWWn/hhfAPjH4hu1s7MTaBNW7/kk1ZSqE/o6J8TtKcEAnxTbQLGnvtlCoCpmHD1
+edc9MkCgglT6fZ+fbI8p
+=lNof
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.5-r2.ebuild b/app-emulation/xen/xen-4.2.5-r2.ebuild
new file mode 100644 (file)
index 0000000..7931526
--- /dev/null
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r2.ebuild,v 1.1 2014/11/26 03:29:54 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ $PV == *9999 ]]; then
+       KEYWORDS=""
+       REPO="xen-unstable.hg"
+       EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+       S="${WORKDIR}/${REPO}"
+       live_eclass="mercurial"
+else
+       KEYWORDS="~amd64 ~x86"
+       UPSTREAM_VER=1
+       GENTOO_VER=
+
+       [[ -n ${UPSTREAM_VER} ]] && \
+               UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+       [[ -n ${GENTOO_VER} ]] && \
+               GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+               ${UPSTREAM_PATCHSET_URI}
+               ${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask pae xsm"
+
+DEPEND="${PYTHON_DEPS}
+       efi? ( >=sys-devel/binutils-2.22[multitarget] )
+       !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+       flask? ( xsm )
+       "
+
+pkg_setup() {
+       python-any-r1_pkg_setup
+       if [[ -z ${XEN_TARGET_ARCH} ]]; then
+               if use x86 && use amd64; then
+                       die "Confusion! Both x86 and amd64 are set in your use flags!"
+               elif use x86; then
+                       export XEN_TARGET_ARCH="x86_32"
+               elif use amd64; then
+                       export XEN_TARGET_ARCH="x86_64"
+               else
+                       die "Unsupported architecture!"
+               fi
+       fi
+
+       if use flask ; then
+               export "XSM_ENABLE=y"
+               export "FLASK_ENABLE=y"
+       elif use xsm ; then
+               export "XSM_ENABLE=y"
+       fi
+}
+
+src_prepare() {
+       # Upstream's patchset
+       if [[ -n ${UPSTREAM_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+               EPATCH_OPTS="-p1" \
+                       epatch "${WORKDIR}"/patches-upstream
+       fi
+
+       # Gentoo's patchset
+       if [[ -n ${GENTOO_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+                       epatch "${WORKDIR}"/patches-gentoo
+       fi
+
+       # Drop .config and fix gcc-4.6
+       epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+       if use efi; then
+               epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+               export EFI_VENDOR="gentoo"
+               export EFI_MOUNTPOINT="boot"
+       fi
+
+       # 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 {} \; || die "failed to re-set custom-cflags"
+       fi
+
+       # not strictly necessary to fix this
+       sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+       epatch_user
+}
+
+src_configure() {
+       use debug && myopt="${myopt} debug=y"
+       use pae && myopt="${myopt} pae=y"
+
+       if use custom-cflags; then
+               filter-flags -fPIE -fstack-protector
+               replace-flags -O3 -O2
+       else
+               unset CFLAGS
+       fi
+}
+
+src_compile() {
+       # Send raw LDFLAGS so that --as-needed works
+       emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+       local myopt
+       use debug && myopt="${myopt} debug=y"
+       use pae && myopt="${myopt} pae=y"
+
+       # The 'make install' doesn't 'mkdir -p' the subdirs
+       if use efi; then
+               mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+       fi
+
+       emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+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/"
+
+       use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+       use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.3.3-r2.ebuild b/app-emulation/xen/xen-4.3.3-r2.ebuild
new file mode 100644 (file)
index 0000000..fde9182
--- /dev/null
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.3-r2.ebuild,v 1.1 2014/11/26 03:29:54 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV == *9999 ]]; then
+       KEYWORDS=""
+       REPO="xen-unstable.hg"
+       EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+       S="${WORKDIR}/${REPO}"
+       live_eclass="mercurial"
+else
+       # Set to match entry in stable 4.3.1-r1, Bug 493944
+       KEYWORDS="~amd64 -x86"
+       UPSTREAM_VER=1
+       GENTOO_VER=
+
+       [[ -n ${UPSTREAM_VER} ]] && \
+               UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+       [[ -n ${GENTOO_VER} ]] && \
+               GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+               ${UPSTREAM_PATCHSET_URI}
+               ${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+       efi? ( >=sys-devel/binutils-2.22[multitarget] )
+       !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )"
+
+pkg_setup() {
+       python-any-r1_pkg_setup
+       if [[ -z ${XEN_TARGET_ARCH} ]]; then
+               if use x86 && use amd64; then
+                       die "Confusion! Both x86 and amd64 are set in your use flags!"
+               elif use x86; then
+                       export XEN_TARGET_ARCH="x86_32"
+               elif use amd64; then
+                       export XEN_TARGET_ARCH="x86_64"
+               else
+                       die "Unsupported architecture!"
+               fi
+       fi
+
+       if use flask ; then
+               export "XSM_ENABLE=y"
+               export "FLASK_ENABLE=y"
+       elif use xsm ; then
+               export "XSM_ENABLE=y"
+       fi
+}
+
+src_prepare() {
+       # Upstream's patchset
+       if [[ -n ${UPSTREAM_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+               EPATCH_OPTS="-p1" \
+                       epatch "${WORKDIR}"/patches-upstream
+       fi
+
+       # Gentoo's patchset
+       if [[ -n ${GENTOO_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+                       epatch "${WORKDIR}"/patches-gentoo
+       fi
+
+       # Drop .config and fix gcc-4.6
+       epatch  "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
+
+       if use efi; then
+               epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+               export EFI_VENDOR="gentoo"
+               export EFI_MOUNTPOINT="boot"
+       fi
+
+       # 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 {} \; || die "failed to re-set custom-cflags"
+       fi
+
+       # not strictly necessary to fix this
+       sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+       epatch_user
+}
+
+src_configure() {
+       use debug && myopt="${myopt} debug=y"
+
+       if use custom-cflags; then
+               filter-flags -fPIE -fstack-protector
+               replace-flags -O3 -O2
+       else
+               unset CFLAGS
+       fi
+}
+
+src_compile() {
+       # Send raw LDFLAGS so that --as-needed works
+       emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+       local myopt
+       use debug && myopt="${myopt} debug=y"
+
+       # The 'make install' doesn't 'mkdir -p' the subdirs
+       if use efi; then
+               mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+       fi
+
+       emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+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/"
+
+       use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.4.1-r3.ebuild b/app-emulation/xen/xen-4.4.1-r3.ebuild
new file mode 100644 (file)
index 0000000..3077ac5
--- /dev/null
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.1-r3.ebuild,v 1.1 2014/11/26 03:29:54 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+       KEYWORDS=""
+       EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
+       live_eclass="git-2"
+else
+       KEYWORDS="~amd64 ~arm -x86"
+       UPSTREAM_VER=2
+       GENTOO_VER=
+
+       [[ -n ${UPSTREAM_VER} ]] && \
+               UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+       [[ -n ${GENTOO_VER} ]] && \
+               GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+       SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+               ${UPSTREAM_PATCHSET_URI}
+               ${GENTOO_PATCHSET_URI}"
+
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+       efi? ( >=sys-devel/binutils-2.22[multitarget] )
+       !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )
+       arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       python-any-r1_pkg_setup
+       if [[ -z ${XEN_TARGET_ARCH} ]]; then
+               if use x86 && use amd64; then
+                       die "Confusion! Both x86 and amd64 are set in your use flags!"
+               elif use x86; then
+                       export XEN_TARGET_ARCH="x86_32"
+               elif use amd64; then
+                       export XEN_TARGET_ARCH="x86_64"
+               elif use arm; then
+                       export XEN_TARGET_ARCH="arm32"
+               else
+                       die "Unsupported architecture!"
+               fi
+       fi
+
+       if use flask ; then
+               export "XSM_ENABLE=y"
+               export "FLASK_ENABLE=y"
+       elif use xsm ; then
+               export "XSM_ENABLE=y"
+       fi
+}
+
+src_prepare() {
+       # Upstream's patchset
+       if [[ -n ${UPSTREAM_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+               EPATCH_OPTS="-p1" \
+                       epatch "${WORKDIR}"/patches-upstream
+       fi
+
+       # Gentoo's patchset
+       if [[ -n ${GENTOO_VER} ]]; then
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+                       epatch "${WORKDIR}"/patches-gentoo
+       fi
+
+       # Drop .config
+       sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+       if use efi; then
+               epatch "${FILESDIR}"/${PN}-4.4-efi.patch
+               export EFI_VENDOR="gentoo"
+               export EFI_MOUNTPOINT="boot"
+       fi
+
+       # 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 {} \; || die "failed to re-set custom-cflags"
+       fi
+
+       # remove -Werror for gcc-4.6's sake
+       find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+               xargs sed -i 's/ *-Werror */ /'
+       # not strictly necessary to fix this
+       sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+       epatch_user
+}
+
+src_configure() {
+       use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+       use debug && myopt="${myopt} debug=y"
+
+       if use custom-cflags; then
+               filter-flags -fPIE -fstack-protector
+               replace-flags -O3 -O2
+       else
+               unset CFLAGS
+       fi
+}
+
+src_compile() {
+       # Send raw LDFLAGS so that --as-needed works
+       emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+       local myopt
+       use debug && myopt="${myopt} debug=y"
+
+       # The 'make install' doesn't 'mkdir -p' the subdirs
+       if use efi; then
+               mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+       fi
+
+       emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+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/"
+
+       use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}