diff options
Diffstat (limited to 'app-emulation/xen-tools')
| -rw-r--r-- | app-emulation/xen-tools/Manifest | 7 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/gentoo-patches.conf | 10 | ||||
| -rw-r--r-- | app-emulation/xen-tools/xen-tools-4.11.1.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild) | 29 |
3 files changed, 30 insertions, 16 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 9466887c06ae..c8d1649e348e 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,4 +1,4 @@ -AUX gentoo-patches.conf 4188 BLAKE2B 747f2812a9556653aa33ac239749943093f066755ce0bad73bc583de5044f052d789e8f203565a1633955a12194c9cab0e04a453b988c45994cbcfc012d83f3a SHA512 38c864703bd08df7c6de281ca930c26cf161b08b364c964cc8d460717f6dc1664d6d81fc773140edec0fb091a051eb3d7cbd170946d8b2f0c0aef970ac179be6 +AUX gentoo-patches.conf 4366 BLAKE2B 27e6d472618011b40355fddb1d2bd390865cfc4964a0d4cbc6e155add291732c390fd9dd99c80c3edc1e4e1bc3251e9cc0c41380ef4246f05559cc8010cd9aa5 SHA512 bb4b90dc754c2c209090b0c5e8becd461aaabcb4748f950d85d3104f64afdceed4f74ca6032f4d962482c9ae72b600e523e5d00f3f114a3e001d065e0085afee AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b @@ -16,15 +16,14 @@ AUX xenstored.initd 1058 BLAKE2B ef28c6f9f1f91dd46d5d431a70736d76a9a72b215b6b8f7 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10 DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d08067d3fd639c83f2a379670779ecc60c74c2671ea4eb4a6659fe08ac2d7d4ff337b010b42a908a50829a2d18eeb SHA512 f65dabde3df967224e2072817211786ee4fc3994ee31f8f9d6f67fd74e3479e1da459c720169dd81020cdc1777e4600e531bb124b4625c2ded42c6005bdc802a DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c -DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198 -DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea DIST xen-4.10.2-upstream-patches-1.tar.xz 31768 BLAKE2B 9205e5fa011426ae3eeaa19694d14ca233805be1e60326d53ec319de1fa28e3b30e7949d7d694ccc8f0e5ea77df580bb6cf22652ae1fd023fdc49b2d37dbce0a SHA512 38c2286d8c1e39d42c266c76d97b5321ca5fb931ebe33ff01c5210fdda4d64ccb39eb6463e756c5178ab7d1c8433a56668abf1dabf4b5b5e85823817d927cd33 DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163 DIST xen-4.11.0-upstream-patches-2.tar.xz 83788 BLAKE2B 3f612492827a1408a3ba058c64b8b9562f7415d19f15241257b7b6754aed472e37538bfed2a017c6664b276f43a1e9c5f87b60454b2eaa0613c84edeb035a28d SHA512 cddc270f2fddbf75f33b45496f5db4586b5463d65fa3604e9df48c116231f088551213c2a021f2b0ad329f7290b36bfdd577cda506c359311c65e897cdf50bd1 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a +DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649 DIST xen-gentoo-patches-14.tar.xz 36244 BLAKE2B 94b751df0ae9a49d1c52ec5fa835d4a040ccb6a4a0f63ef6ef628191163ce7dbd47d4e3b2dbb1cf6cf6c8b368bea4267ff989754482c4794209a80eae9313c25 SHA512 8a23aeddbcf80c049da36e3ef9d797c16996b45be21b56f46f3c9c3833a7c1028fd9ed56fc8053faeb78db21076608de2eb32908e1ae1285f4f200ace40c8c2d DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b -EBUILD xen-tools-4.10.1-r2.ebuild 13992 BLAKE2B be68b8d08e2573cae3f9af96a5454f69a502884ae02375f92f21c8e46754ca8cdcb7bc0e4d179f2f3187a87e3d1612a287068e1d9990ab67399de16b4e173536 SHA512 9f1ade8aba5d7eb7fd7f59de57aedba3df7700178c9cad913a8dcd1b03374ab48391f9c1de74a3129faa962117b8df02f5cf92f2c2ced9c5e9df75ca3ae8fc92 EBUILD xen-tools-4.10.2-r1.ebuild 13961 BLAKE2B 8ece04061371ab20e76d186cc41779fcf16d4f89cc012c20125dac0757c1683af00548eef37280a84ec28308c4693664f782224deed737d843d445510fd66bb5 SHA512 575f6e6cb7eb30e3a1362ee026e8cc420d1f34237a641901a1d999e185f9907f7d4769f841a2f63fee615187c116edb40168d02d93e6abb6cfc1ea10e597d68b EBUILD xen-tools-4.11.0-r3.ebuild 14011 BLAKE2B d6f25b322ac37231862f42368475936d77c64f69f71b2fa840819192dd528a47ba173a278937153deba79548fd94f66aa01f75d40b9819a61f838d01fece003d SHA512 34a825e9884b55826c5ac6eeab82053dc6c40a76f5ed7a095b08893964c6ba84e1c2a39985d37af2c0117ef86f145d97dd7dcd6bf9bee1f4f5ad08e0556a9b5e +EBUILD xen-tools-4.11.1.ebuild 14121 BLAKE2B 81d6e20bcdf28eeaefe4acea167eeb450d13a771cdb24a8cc31915bb86d9a21a58c479f6ea9a4824511f23fdca837e9a5a6bc190c6907bc6472f82f119362246 SHA512 e32bc9f28769fe6c371d56314075796abd1bc83047183f22d6493c0e615c25d1431dbef9acbaf4dcfb723b28f6b127e8e13094145a7b8c9b8ac42afe8afe9117 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647 diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index d4bdaa12c71b..b645e2447004 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -145,3 +145,13 @@ ${_gx037} ${_gx042} ${_gx045} ${_gx046} ${_gx048} ${_gx049} " + +# xen-tools-4.11.1 patches set +_gpv_xen_tools_4111_0=" +${_gx038} ${_gx017} ${_gx043} +${_gx027} +${_gx028} ${_gx029} +${_gx037} ${_gx042} +${_gx045} ${_gx046} ${_gx048} +${_gx049} +" diff --git a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.11.1.ebuild index 57728136499b..7974e45297ca 100644 --- a/app-emulation/xen-tools/xen-tools-4.10.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.11.1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='ncurses,xml,threads' -inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator +inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs MY_PV=${PV/_/-} -MAJOR_V="$(get_version_component_range 1-2)" if [[ $PV == *9999 ]]; then inherit git-r3 @@ -17,8 +16,8 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="amd64 ~arm ~arm64 x86" - UPSTREAM_VER=2 + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + UPSTREAM_VER= SECURITY_VER= # xen-tools's gentoo patches tarball GENTOO_VER=14 @@ -59,7 +58,7 @@ HOMEPAGE="https://www.xenproject.org" DOCS=( README docs/README.xen-bugtool ) LICENSE="GPL-2" -SLOT="0/${MAJOR_V}" +SLOT="0/$(ver_cut 1-2)" # 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 @@ -109,8 +108,7 @@ DEPEND="${COMMON_DEPEND} dev-texlive/texlive-latexextra media-gfx/transfig ) - hvm? ( x11-base/xorg-proto - !net-libs/libiscsi ) + hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman @@ -141,7 +139,9 @@ QA_PREBUILT=" usr/libexec/xen/bin/ivshmem-server usr/libexec/xen/bin/qemu-img usr/libexec/xen/bin/qemu-io + usr/libexec/xen/bin/qemu-keymap usr/libexec/xen/bin/qemu-nbd + usr/libexec/xen/bin/qemu-pr-helper usr/libexec/xen/bin/qemu-system-i386 usr/libexec/xen/bin/virtfs-proxy-helper usr/libexec/xen/libexec/xen-bridge-helper @@ -249,7 +249,7 @@ src_prepare() { 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 + -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" @@ -356,6 +356,7 @@ src_configure() { use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" use amd64 && myconf+=" $(use_enable qemu-traditional)" + tc-ld-disable-gold # Bug 669570 econf ${myconf} } @@ -397,8 +398,12 @@ src_install() { # Remove RedHat-specific stuff rm -rf "${D}"tmp || die - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - use doc && dodoc -r docs/{pdf,txt} + if use doc; then + emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs + dodoc -r docs/{pdf,txt} + else + emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 + fi dodoc ${DOCS[@]} newconfd "${FILESDIR}"/xendomains.confd xendomains |