diff options
Diffstat (limited to 'app-emulation')
58 files changed, 1514 insertions, 931 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex ef97b01cf16d..5f1d48a56932 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 0bbe2c2ea4cc..ec2ca93f6adf 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,14 +1,9 @@ AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2B ac48bd7835011bd3cad719bf2d0bdf6457bb6271989e1e7159ea5c3049e332cea6f5649f39d89820c724a03d50044ea3177fd48b23f5ea67f8518b9f011bd0c5 SHA512 7e6f499eb27372a068909c823884a788f7bab7f0852ec2b67c2a2d475f9dae15dedad130d548b6986978c3b85a4c5e2ba12ee37e529d18461be82546d5e2a638 -DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c -DIST containerd-1.0.3_p20180223.tar.gz 5029605 BLAKE2B bd3f74ad70c7de9a73397e401e49459d1724376434265dddddd51cf09ccd940ecf63dacf0dc7270175d99e473c224ab238c0c29b0e03d41ddf9295ef37b90586 SHA512 a4999c1eb16c40178e3ee63f4001d4826d2dc6f353f768fbfdc6b7e0962d0f4431014fdedc712f36aee1e05554fecf1917ac48c1e25818b6c80a423ed7edddd9 -DIST containerd-1.1.0.tar.gz 5095823 BLAKE2B 1eca83add164ed79abc58bfe424da9f34b54d247ad147ec0f4ae20154cabefe147fe9b03ce2eab04c88c240f00995eec5b0f24c0e064640738517b81e3e7aa3d SHA512 34e687c6ef270370160465ee9b8fe6b59780543907917b668db7867da67fd47c8465f57ba4268387f776d0f392f8dad533c206d6577bab36480aff4392775d42 DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd -EBUILD containerd-1.0.1.ebuild 1238 BLAKE2B 58cebf0f2ec0958892599bbbe2f518e42cf6d98a91880c1393bbff38d51958b918ccd838d92e7a39bda493b1b4c52d1ecfa02ffb2dbb9ba46b165acf47abe1a7 SHA512 3e3013ed0bec752ddff0bc524cb6c003b8c41db036201f9212bff1a298abf4486c64b7d65e3fd1e9d972e53b2c18d1d87f5f9db12d28ef9bca7f4c4981b6ce3d +DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc -EBUILD containerd-1.0.3_p20180223-r1.ebuild 1375 BLAKE2B 13216281e1705042ca721693a9c77174243e83b2384ad4272d03f460688da50e55b45eeb4f7d23d5eac4c57b6434e5c7f2675ffb1eecf244f9fa4ceed7638244 SHA512 a9d25044e4aed1c35cc4cf5e51c825405ed2549a2e48decdb3ae30abf54ed43385e4049809bc5d1a8f7e3c966e1ed980ab325d339c6ad882dfac4ba05b86f9b9 -EBUILD containerd-1.0.3_p20180223.ebuild 1302 BLAKE2B b6d58ed568a7e402b1417c8fcfd9bb6d07ad57017859a50f178abc65b776eb6100c9067c8c7ce36a275368c0ceb84d72e81e0beada64a82d4caf88a01025dbeb SHA512 73f29cb43c6f819e859a758513fedd8ac67816ea6ef18435b34aafe1e1e564169927a2d7c54b0bde6816f64e3f840f0c75cb09b0742ccf17f46602e6a7e89c7a -EBUILD containerd-1.1.0.ebuild 1289 BLAKE2B af1f7b19a91f90ece5ffa24f9282d0b7ebda179590b949c30d3d172b0c7829fb3e4d0a615a6d3fa94d548cdb1735ec0e38c8bd28d040dec272b9bc51cfffa733 SHA512 823c1d1dbf754d94f6143a173b893f837ac643eeae9510105699af3725a2b5d529cb9c98e5d1afdaab7c456e72a4d10440b9ccedea9537c21069bfefec3a2094 EBUILD containerd-1.1.1.ebuild 1289 BLAKE2B e5ace69d6c9a0cd9271ae86da50bd75a224c2cc6c5d04b5dfee43cee92f4fa3084337978a409408c4dc447ea86964e4ec22868bffaae547bbd0ea3dec6b4299f SHA512 9ea0297903f3317aff7de788300920b3a30a77c892c6942f2a2e99e22da8b3aad25af24db398f890e760c0c707eb1acad9caa8a158d140064a8c5fff6e2826e7 +EBUILD containerd-1.1.2.ebuild 1443 BLAKE2B d89b48bc2afd30e2a194f4eb9a1d62c517638f32c5c944b8ab9b06b08455476afb0d935daeb5c452c19490daecce7e52c5cb0f2eac7a3ccadc209cba0daab437 SHA512 f635fd95faf1651974cca042a2c7183de014f22bcfc29359c55e3d50648efa53ff6ee47214042e3e84917dc7bdf7c5dbd4ddcb03dc189a0fd36e88ec020c5cda EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 -MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147 +MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3 diff --git a/app-emulation/containerd/containerd-1.0.1.ebuild b/app-emulation/containerd/containerd-1.0.1.ebuild deleted file mode 100644 index 4495f7028494..000000000000 --- a/app-emulation/containerd/containerd-1.0.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/containerd/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_rc/-rc.}" - EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="9b55aab" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+btrfs hardened" - -DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 - >=app-emulation/runc-1.0.0_rc4 ) - sys-libs/libseccomp" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -src_prepare() { - default - if [[ ${PV} != *9999* ]]; then - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ - -e "s/-s -w//" \ - Makefile || die - fi -} - -src_compile() { - local options=( $(usex btrfs "" "no_btrfs") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd{-shim,-stress,} bin/ctr -} diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild deleted file mode 100644 index a37f908adc0d..000000000000 --- a/app-emulation/containerd/containerd-1.0.3_p20180223-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/containerd/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_rc/-rc.}" - EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac" - SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+btrfs hardened" - -DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 - >=app-emulation/runc-1.0.0_rc4 ) - sys-libs/libseccomp" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/"${P}-remove-c-constant-redefinitions.patch" -) - -src_prepare() { - default - if [[ ${PV} != *9999* ]]; then - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ - -e "s/-s -w//" \ - Makefile || die - fi -} - -src_compile() { - local options=( $(usex btrfs "" "no_btrfs") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd{-shim,-stress,} bin/ctr -} diff --git a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild b/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild deleted file mode 100644 index 3c7eee7d07d2..000000000000 --- a/app-emulation/containerd/containerd-1.0.3_p20180223.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/containerd/${PN}" - -inherit toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit golang-vcs -else - MY_PV="${PV/_rc/-rc.}" - EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="4ac4fd0b6a268fe6f38b2b2e32e40daa7e424fac" - SRC_URI="https://${EGO_PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - inherit golang-vcs-snapshot -fi - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+btrfs hardened" - -DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 - >=app-emulation/runc-1.0.0_rc4 ) - sys-libs/libseccomp" - -S=${WORKDIR}/${P}/src/${EGO_PN} - -RESTRICT="test" - -src_prepare() { - default - if [[ ${PV} != *9999* ]]; then - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\ - -e "s/-s -w//" \ - Makefile || die - fi -} - -src_compile() { - local options=( $(usex btrfs "" "no_btrfs") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd{-shim,-stress,} bin/ctr -} diff --git a/app-emulation/containerd/containerd-1.1.0.ebuild b/app-emulation/containerd/containerd-1.1.2.ebuild index 1b01107dcac3..2aebd40c4137 100644 --- a/app-emulation/containerd/containerd-1.1.0.ebuild +++ b/app-emulation/containerd/containerd-1.1.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_rc/-rc.}" EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="209a7fc3e4a32ef71a8c7b50c68fc8398415badf" + CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc64" inherit golang-vcs-snapshot @@ -22,12 +22,13 @@ HOMEPAGE="https://containerd.tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="+btrfs hardened" +IUSE="apparmor +btrfs +cri hardened +seccomp" -DEPEND="btrfs? ( sys-fs/btrfs-progs )" +DEPEND="btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp )" RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) - sys-libs/libseccomp" + seccomp? ( sys-libs/libseccomp )" S=${WORKDIR}/${P}/src/${EGO_PN} @@ -44,7 +45,7 @@ src_prepare() { } src_compile() { - local options=( $(usex btrfs "" "no_btrfs") ) + local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") ) export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}" } diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml index 7cc463053468..a28d7bea81ae 100644 --- a/app-emulation/containerd/metadata.xml +++ b/app-emulation/containerd/metadata.xml @@ -21,7 +21,9 @@ <name>William Hubbs</name> </maintainer> <use> + <flag name="apparmor">Support for AppArmor</flag> <flag name="btrfs">Support for BTRFS snapshot driver</flag> + <flag name="cri">Support for Kubernetes CRI</flag> </use> <upstream> <remote-id type="github">docker/containerd</remote-id> diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 48aaf38a4d8a..257695baad35 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,5 +1,7 @@ DIST diskimage-builder-2.14.1.tar.gz 348188 BLAKE2B 3d751fc3f05578a7b5296c8b7ebde1b8dd0a38e40dc378fded93faa34c623db2abeac53c72048ce7ebd5747eb50a4f9e5525baba800adc4b2c1925f31a1dce0b SHA512 d056c89e78b3f42ccc5ced2dfdd9ac1c50ecdcb6861f81bdb3cd3c9d624fbba89c2a2b9ed08850dd79ff9fdf47fcaa3d3519b32f909bd1b0b12bbacf4d9ab758 DIST diskimage-builder-2.15.1.tar.gz 359802 BLAKE2B bfcd43ae76350f72d368bbb6eadf61d72de3ca26963399004921df721213d8aeb1c980085d414b227674d2b147ee06531381b59e78e7b11f949dfc4d63f43f5b SHA512 7ab18f4d950c7578fc5f16f0aabfb469a74b38b0aa9d3209550019e3ea585a451a69be0a46901df2ae1ecfdc0dabcbd5554edae4ea71ae2921f5a8e99d4cb0b9 +DIST diskimage-builder-2.16.0.tar.gz 357777 BLAKE2B 29d9c2e0a2a42de3939a0ebac499f13755ef883074a43f7147e322af8c6cb2120fc0987271a4f6d4cead775283b4d502302dd50e8b3411e265c826b7f7fb9617 SHA512 2a10d7e3b69968f91de9f3aded7109addbe48201567257f1e849985dca7ad4860247aac431d3055780f2345670d10a27714acfb74507078bd6ec585c05cc7635 EBUILD diskimage-builder-2.14.1.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60 EBUILD diskimage-builder-2.15.1.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60 +EBUILD diskimage-builder-2.16.0.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.16.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.16.0.ebuild new file mode 100644 index 000000000000..1495264437fd --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-2.16.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Golden Disk Image builder." +HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] + !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${CDEPEND} + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] + >=dev-python/networkx-1.10[${PYTHON_USEDEP}] + <dev-python/networkx-2.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] + >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] + <dev-python/flake8-2.6.0[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] + app-emulation/qemu + sys-block/parted + sys-fs/multipath-tools + sys-fs/dosfstools + sys-apps/gptfdisk + !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest index dc4943a785f6..d25e48df84d0 100644 --- a/app-emulation/docker-proxy/Manifest +++ b/app-emulation/docker-proxy/Manifest @@ -1,6 +1,6 @@ -DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299 SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600 -EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79 +DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4 SHA512 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3 +EBUILD docker-proxy-0.8.0_p20180626.ebuild 829 BLAKE2B 0dcac0f9e9fbf4536fec01659078d4250fb315b472dabfaad4b40d79402f965bb8c34769c321392422752533c64dac2385397b0c32bea0f41c5e2686cca431e4 SHA512 35abd90d714eafed2f59472fa7c7a0e50d46dcef758f4a9800b62cd36d0ce2a701e3b4f38000636beeaf98346d7909ffaa77338f984e6efe7789b99271aa739e EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6 diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180626.ebuild index 5a4839ae1018..b48125951938 100644 --- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild +++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180626.ebuild @@ -7,9 +7,9 @@ EGO_PN="github.com/docker/libnetwork" if [[ ${PV} == *9999 ]]; then inherit golang-vcs else - EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e" + EGIT_COMMIT="3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" inherit golang-vcs-snapshot fi @@ -27,7 +27,7 @@ RDEPEND="!<app-emulation/docker-1.13.0_rc1" RESTRICT="test" # needs dockerd src_compile() { - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -o "bin/docker-proxy" ./cmd/proxy || die + GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die } src_install() { diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 9f7ea8e35904..e24e535f8838 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,10 +1,7 @@ AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e04264318fec93df80a5f7f9b4cfc84b9f31ea1185d7752e431d714dd901b168c490562688c124aac8d48fef9c1266d7a8fa07aa06de7e40d08 SHA512 936d3948fd3ccadd4a3810bb8fc32e31e7e24b810e87658e5e53560b515454db6b72b0cda3ace78b9267e197e55181c04fbea92a1656f6a282e29f37d2994adc -DIST docker-17.12.1.tar.gz 11046888 BLAKE2B f50236826d8b064023e76a6c23a52c307eada73338d25fcc4fd3448a855f91b0f1d3080408bc9e58102467a9605c54c20080773b46851135566b85ce00f7dfb8 SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10 -DIST docker-18.05.0.tar.gz 12822443 BLAKE2B 16f96ddbbb2b9d06724d659dba71990fd1aae1a568fb2d1bc7f6ae2bf2133524f6e0c1192deb045021342d3a8cc273f67b7228c51c032e75ee75c00a47f76bf8 SHA512 81997f32a45bf9cf7e79c936728999dac84e6c51e7ec04c7dd4f0fc1fbc837aaddd2ce4fa5e4e3eb2ee99599b005f06104b81b0fa858e59692c17398a341bfd1 -EBUILD docker-17.12.1-r1.ebuild 8355 BLAKE2B 2635bafbdc6be0840a83717e862b45045c0c30748c8633b76d2913b6497fbf921a24e85580208055ed22eb92c6fd990e1642cac56e41a7149d614d328b65c670 SHA512 e78bbe39f140d48ca9c49ff7efda41f5d531327ec9be528238aa2929636cc59704dadaa7d689c7c34abcab2c869430f118763878a74cecc0bcf73748cfa2cc69 +DIST docker-18.06.0.tar.gz 13656557 BLAKE2B cc5e28d47eca07a42f040d8b47de25a35403e9e0451ca57eddcf1b6721169eb9bc41d4f4b5aad355f4394534e339ccbc83c6fb6d4df750c9738f1aa2466f90ef SHA512 d5bd6a83126c4dba14c775533b6c9bda35af2cd97db13922b3766494ce10dd9316d0167c87a6683dede28ea063f9435a0a009b96e413dad8abc7884a3468d589 EBUILD docker-18.03.1.ebuild 8337 BLAKE2B f0b13adc75d2a334eaf91938b2774a5216fa4ef7905032f59e313d87367c7de07a6868e443f65db881bbeaabc8aeaf008aec8836827513b546ddd3bfeab599d7 SHA512 09645b50f569e37e94c7f8e36503ce949fe709ff22d579b9e2e2183a573196ae3bdf0a991c71af56a37e2e8fa7e3341289154dee4e1a336ea1b212cd63079bc9 -EBUILD docker-18.05.0-r1.ebuild 8445 BLAKE2B 577b09594e9ed4d9a74f2a56655e96de772c5a0820d09d58728c195c9b062b484e7c930e79150e8ecb83cda73853a1493204f58b839c4bad68d331c106e5bdeb SHA512 9b75250b759f228ac78b182097b8e52d9aeec0d88d8260a2c4335f75bdc8a8dbdd588ee3503f1e3c65027eb435139c9ddf07503bb6a617b905a03ee489204549 -EBUILD docker-18.05.0.ebuild 8355 BLAKE2B 20456aafd21ee6a408bc07a43933ed1ec43210b2ee3651891a132a3c3b2731ded5af129a50e4f8ed9da3b8c38951678183164d9004f1ddc788375a78122e7a99 SHA512 8d5d01b4a270368de798558de44423aefe5cab17590882a9e57c74c41ebc73368ad28b10824bde845747f942035b036c483c71b556d28498a3d6524a946255f3 +EBUILD docker-18.06.0.ebuild 8445 BLAKE2B 1f51219ccefc26a7c256122a54afcbf272951190e8b1ec9c79bdb2e3b25a67fd3ff1d9070afb5c75ad0b944b35d3e8adea7ced0ec25ee886c40ee1c30867d681 SHA512 1e8950e9ed1bd550043aa99b5921c1bfa5e4ed022d462f5e1b94499fca1c9d511a6f22b364f2dc06c8e5e18616a1db43befb69a9ee8ceb9365f728e8a14ad70d EBUILD docker-9999.ebuild 8168 BLAKE2B d1111f0132aa330f95f8f9dcd5c49aee0c8a0eaa5ee3cbd567be89f0d2f4b8c230c80d817fe14272d7c2765f1877ad070ebe98107575ec0f43d10e2f6f6b089b SHA512 e629feee1e546a0ea4570692446697899199248334fc00337963eda8857fadde618fc42ad23288f4239cb7f6f71ad52a61a2d275e54a7694fd79fa1fc1610df3 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b diff --git a/app-emulation/docker/docker-17.12.1-r1.ebuild b/app-emulation/docker/docker-17.12.1-r1.ebuild deleted file mode 100644 index 8f6b75e777cd..000000000000 --- a/app-emulation/docker/docker-17.12.1-r1.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/docker/docker-ce" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - inherit versionator - if [ "$(get_version_component_count)" = 4 ]; then - MY_PV="$(replace_version_separator 3 '-ce-')" - else - MY_PV="$PV-ce" - fi - DOCKER_GITCOMMIT="7390fc6" - EGIT_COMMIT="v${MY_PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev user - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://dockerproject.org" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - device-mapper? ( - >=sys-fs/lvm2-2.02.89[thin] - ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - apparmor? ( sys-libs/libapparmor ) -" - -DEPEND=" - ${CDEPEND} - - dev-go/go-md2man - - btrfs? ( - >=sys-fs/btrfs-progs-3.16.1 - ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${CDEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.0.1 - ~app-emulation/docker-runc-1.0.0_rc4_p20180122[apparmor?,seccomp?] - >=app-emulation/docker-proxy-0.8.0_p20170917 - container-init? ( >=sys-process/tini-0.16.1[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch ) - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED - - ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - - linux-info_pkg_setup - - # create docker group for the code checking for it in /etc/group - enewgroup docker -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # fake golang layout - ln -s docker-ce/components/engine ../docker || die - ln -s docker-ce/components/cli ../cli || die - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor pkcs11 seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - pushd components/engine || die - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - VERSION="$(cat ../../VERSION)" \ - ./hack/make.sh dynbinary || die 'dynbinary failed' - - popd || die # components/engine - - pushd components/cli || die - - # build cli - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat ../../VERSION)" \ - GITCOMMIT="${DOCKER_GITCOMMIT}" \ - DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - dynbinary || die - - # build man pages - go build -o gen-manpages github.com/docker/cli/man || die - ./gen-manpages --root . --target ./man/man1 || die - ./man/md2man-all.sh -q || die - rm gen-manpages || die - # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - - popd || die # components/cli -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - pushd components/engine || die - newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" - popd || die # components/engine - - pushd components/cli || die - - newbin build/docker-* docker - - doman man/man*/* - - dobashcomp contrib/completion/bash/* - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - popd || die # components/cli -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot, add Docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog " usermod -aG docker youruser" - elog -} diff --git a/app-emulation/docker/docker-18.05.0.ebuild b/app-emulation/docker/docker-18.05.0.ebuild deleted file mode 100644 index 2aa4b4c2a972..000000000000 --- a/app-emulation/docker/docker-18.05.0.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/docker/docker-ce" - -if [[ ${PV} = *9999* ]]; then - # Docker cannot be fetched via "go get", thanks to autogenerated code - EGIT_REPO_URI="https://${EGO_PN}.git" - EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit git-r3 -else - inherit versionator - if [ "$(get_version_component_count)" = 4 ]; then - MY_PV="$(replace_version_separator 3 '-ce-')" - else - MY_PV="$PV-ce" - fi - DOCKER_GITCOMMIT="f150324" - EGIT_COMMIT="v${MY_PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64" - [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" - inherit golang-vcs-snapshot -fi -inherit bash-completion-r1 golang-base linux-info systemd udev user - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://dockerproject.org" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -CDEPEND=" - >=dev-db/sqlite-3.7.9:3 - device-mapper? ( - >=sys-fs/lvm2-2.02.89[thin] - ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - apparmor? ( sys-libs/libapparmor ) -" - -DEPEND=" - ${CDEPEND} - - dev-go/go-md2man - - btrfs? ( - >=sys-fs/btrfs-progs-3.16.1 - ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${CDEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.0.3_p20180223 - ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20180411 - container-init? ( >=sys-process/tini-0.16.1[static] ) -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch ) - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED - - ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - if use overlay; then - CONFIG_CHECK+=" - ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL - " - fi - - linux-info_pkg_setup - - # create docker group for the code checking for it in /etc/group - enewgroup docker -} - -src_compile() { - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # if we're building from a tarball, we need the GITCOMMIT value - [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT - - # fake golang layout - ln -s docker-ce/components/engine ../docker || die - ln -s docker-ce/components/cli ../cli || die - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor pkcs11 seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - pushd components/engine || die - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - VERSION="$(cat ../../VERSION)" \ - ./hack/make.sh dynbinary || die 'dynbinary failed' - - popd || die # components/engine - - pushd components/cli || die - - # build cli - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat ../../VERSION)" \ - GITCOMMIT="${DOCKER_GITCOMMIT}" \ - DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - dynbinary || die - - # build man pages - go build -o gen-manpages github.com/docker/cli/man || die - ./gen-manpages --root . --target ./man/man1 || die - ./man/md2man-all.sh -q || die - rm gen-manpages || die - # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) - - popd || die # components/cli -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - - pushd components/engine || die - newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - insinto /usr/share/vim/vimfiles - doins -r contrib/syntax/vim/ftdetect - doins -r contrib/syntax/vim/syntax - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" - popd || die # components/engine - - pushd components/cli || die - - newbin build/docker-* docker - - doman man/man*/* - - dobashcomp contrib/completion/bash/* - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* - popd || die # components/cli -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot, add Docker to the default runlevel:" - elog " rc-update add docker default" - elog "Similarly for systemd:" - elog " systemctl enable docker.service" - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog " usermod -aG docker youruser" - elog -} diff --git a/app-emulation/docker/docker-18.05.0-r1.ebuild b/app-emulation/docker/docker-18.06.0.ebuild index f92326ef664c..5e383f38290e 100644 --- a/app-emulation/docker/docker-18.05.0-r1.ebuild +++ b/app-emulation/docker/docker-18.06.0.ebuild @@ -17,7 +17,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="f150324" + DOCKER_GITCOMMIT="0ffa825" EGIT_COMMIT="v${MY_PV}" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64" @@ -61,10 +61,10 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - ~app-emulation/containerd-1.0.3_p20180223 - ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20180411 - container-init? ( >=sys-process/tini-0.16.1[static] ) + ~app-emulation/containerd-1.1.1 + ~app-emulation/runc-1.0.0_rc5_p20180509[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20180626 + container-init? ( >=sys-process/tini-0.18.0[static] ) " RESTRICT="installsources strip" diff --git a/app-emulation/phpvirtualbox/Manifest b/app-emulation/phpvirtualbox/Manifest index 0b3810c33cb2..b6e74e42b436 100644 --- a/app-emulation/phpvirtualbox/Manifest +++ b/app-emulation/phpvirtualbox/Manifest @@ -7,4 +7,4 @@ EBUILD phpvirtualbox-4.2.7.ebuild 1779 BLAKE2B cb00f1b29079bb61f1e6ebcdecb6a21b8 EBUILD phpvirtualbox-4.3.0.ebuild 1771 BLAKE2B d6acaaf564ca5cd7e415d1c88a1a552a0addf35630e8c8d992fadbc1bb75d51ae579ef3254be9f297f1024c6f69abd595fa66a772142d0ade2503373c192ab45 SHA512 72cbe2fe6dca2e61fea66e5da7c10b844bf1a4f650ff9a32572b04136b06d989deb2aa110bdb63133ea9946a90103b6f2f3cc588b6f151e943e3175b2f7489fd EBUILD phpvirtualbox-5.0.3.ebuild 1779 BLAKE2B d28d5f08e63ee87387f3bcce1c3b99fe62848311b81095ff3b15f426dab4febf2787c0f919c4c00628432d757478b93ff84d2cfcbbaa46a9097ec0ae5488836b SHA512 ee7a040f11c7660fad03907e8e181620e066e7a7fc421b23e50f1e88b73e6288e47ff68f9a47c72d1e8be6c9b50cd4f5099f6e02f8fc2803a54820cb6cc76b3c EBUILD phpvirtualbox-5.0.5.ebuild 1777 BLAKE2B ab3e9649df822905f20c36e7d128b4a048b202ecb2f6d22742d8ae25ae786183732a0094f5302bfd781279e1712f72d050f6d80d3a10deb5f73f16d8698673e5 SHA512 faf7326b0df465ad260b07632bfb6b5a4c7f0e164d560d65956cffc17210ebd1d32fb14f6b082280afe7e73f44b9a5b84c4c2e99e2da3c4698275ab402f6be2d -MISC metadata.xml 391 BLAKE2B c8873cd725bac1d997bd135f1bda0cb53868b3c3781711fac0c3c453515096056a77833fe0c52113ff870865f3fa529ce40683d8db8a61a18e39144467ae71a4 SHA512 8518a50e3abf876a271671bb64e05c8e5dc00aa2e7f482b177ceb3bf188e9ac5e71356568512031727199b2dcb0baebda99a730cc58fd4cd39e4280698407e86 +MISC metadata.xml 308 BLAKE2B 15cefacb57d5c54d20459ab621b5fe04eb087955f51e427ccdf87c3739379999238939cdf6d2fd5113ad1e47d0d4d3732060f68cc8834a28a7a7d12c3f7cec49 SHA512 26be35e054b6129811d4144bf4f5f37f2a7dc7d1876635fe8e105dd96ff480914fcc71e05968e76f8f257de7779d399f5e95228d95640188e54846697ba13d52 diff --git a/app-emulation/phpvirtualbox/metadata.xml b/app-emulation/phpvirtualbox/metadata.xml index 60ad403971c9..2ee0da8b117c 100644 --- a/app-emulation/phpvirtualbox/metadata.xml +++ b/app-emulation/phpvirtualbox/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hwoarang@gentoo.org</email> - <name>Markos Chandras</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="google-code">phpvirtualbox</remote-id> <remote-id type="sourceforge">phpvirtualbox</remote-id> diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest index 10237c643216..5787945e3629 100644 --- a/app-emulation/q4wine/Manifest +++ b/app-emulation/q4wine/Manifest @@ -1,3 +1,3 @@ DIST q4wine-1.3.6.tar.bz2 2867547 BLAKE2B b35a638e514108e4ee4be34b446a7d2d5ba00415d8f54cfee293988707b637d41945d3197a2132147e09d5a05153fd47a55701dcba358f3a2b3a2e6037f78aaa SHA512 1ff0ea2a4523fc5582ec67f5e305622653c4e387ac5f2cecde52289117ef879a60261fdbf9ddf421812765539124d4c5b6b37ff401530d3e061723a3c35d57f8 EBUILD q4wine-1.3.6-r1.ebuild 1360 BLAKE2B 1b5be13d28f3292a3ce36263b362cbd51099b51ced181866c5ea7bc88443fd83b561a9794b0ef767b9376ff7a469bb1089d20d9575c53d8938bd9ab4ca12aa3d SHA512 58a1a5adc2f3c3767d0168a78e3e7c90da2827dc630572a5f5b7e5139a6c69c3c6cde15d6328056ab547962d665837bd9364557c284b2aa4442aa033a92591c7 -MISC metadata.xml 752 BLAKE2B f976286507d460c2af485d59e23ce2af28037e104482fc2eef65d221b0426b0aff585b94eb9767a0aee469797dc091ac1584466521c35d705449dc132fb621a3 SHA512 ccd0facc9545646763dccfe146cc12bea33818a15c99a23930c684114c0a62fd93969611aa5f0a340dff709e09e203cd0e63490ca147b3253e5977216d1d74bd +MISC metadata.xml 641 BLAKE2B af03073e86a430ccc228ba18c2dd18d4fe8d07438e5beec07f3712807a792829096cb3eeaa4e912a80c2634a1bb16ef20ddbc08684fc4fdf2b14d839cd520733 SHA512 707f77ef56bb3bcbe4bda434f1262f77c0b337a8789508e0df04d2cd791959ca7dc67b74ac81b6e248023f3da83c86bcf7f185ca689ab7b3bf346250850df8ed diff --git a/app-emulation/q4wine/metadata.xml b/app-emulation/q4wine/metadata.xml index 3aa5ee2de7b8..098a455159e2 100644 --- a/app-emulation/q4wine/metadata.xml +++ b/app-emulation/q4wine/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hwoarang@gentoo.org</email> - <name>Markos Chandras</name> - </maintainer> <maintainer type="project"> <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest index f0aa2bfcd247..ae60d2fb68cc 100644 --- a/app-emulation/reg/Manifest +++ b/app-emulation/reg/Manifest @@ -1,7 +1,6 @@ -DIST reg-0.13.3.tar.gz 5396000 BLAKE2B c5fa658010cb5c1cc21d7edfc1b18fac8c65cf2bd3c6de213ab238aabcb1377096172b5484a92f18a04f9ef4c01124dcfcfd4e6eabaf9f9a9b272c6f1f1fc482 SHA512 aefe0e5d3b1a02d54e67a4c7892e6b6c7581793f9e45995933200125c275e38701ad25b772c4541714f72ad1b43865e484bd062e40edbb7ed5faf2a572c224a1 -DIST reg-0.13.4.tar.gz 5401627 BLAKE2B 278462ff66917833feb9a660b39f9826afe1b71f7a75dad07f3673bd5ba63496152aa70147649ddf9d2266cbad3903ba3a4bbe4a7def76a932ea45131bdda8c5 SHA512 f8a1a52824b64cc252a5cd4f6c18d8cf73c88170342f0bab61664f5cdb50295510182c3c15afdfa02c1eae8d299e347a78b47d171ca275c01ecfd9228323c872 -DIST reg-0.14.1.tar.gz 5401469 BLAKE2B 858c699b15e2222685e114d7c7619424dde6eb87cff08f79de621d5c0d35303b0e8f10981b5c0839633eebbb223658189369899f1a3e15bbdf1cf10dffcf88cf SHA512 2904b5da02cd5f0d98447aa86e36e13f96b1e0ef8f81f97d3fd801e3d477909c6d893db8af4e84591a4630633a698b8a21e673d5abbc169812ebd857615b8401 -EBUILD reg-0.13.3.ebuild 806 BLAKE2B 5c3fe5fb410486a9cd0a6cf615c67115d1146e5a0f7f7af893775d33bf2f019688dc3eb34a82536970c586dfc3426f06737dccddfcdf7a725bcd700fb4750524 SHA512 602b21b967133649100f7b45ef634fa6efafcbccc7ccc4e379cf1d1f35b1299f943e1738a5136bbcf34834ba7b7bf9d842ca2eef3517b657006b280d47992ae2 -EBUILD reg-0.13.4.ebuild 806 BLAKE2B ab560a1208b10c2ffcd8a691d86310a3ec29fcc813008524078d7c298dc40591017f80bd05387de0096264dde2e387b09b81797306744d379b7af78eb7ad9e1d SHA512 03748e3f43301af2b5924f65ab19f40a34cd450debbef6f2d92f06b9aeee84fa702ecd3aa93d12ad766fda3dd3526839ff7c3d8895366f88f66ef801bd060eb0 -EBUILD reg-0.14.1.ebuild 806 BLAKE2B bdb9149e9e8249644e47728ef52ad416dfb921602a35247d9612d91da64804b4a57d2797de5c2e8d5e9fceb0563371f8e3d16df8185c2b6bc6b9f9dba2a5217b SHA512 bf6db05e2f1671908a0cf2f7e234db6f1f8d9f3c87f34094684ae38ac87e142e915a0e81de0ba60fb03bc6bff0ab4eeb9c9017ed4e594422279b0ebe69019337 +AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e +AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a +DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd +EBUILD reg-0.15.4-r1.ebuild 1060 BLAKE2B 769a395dd1cfa2cbcdd691dc66a2e94f8b9efbbf24347dd9ebf56da7a6a705d6e057efaac9a227d9e22e52b679dda38ef3bbebab31c8f33b0989d5cd43f13e8b SHA512 8fc065165a355d2a8cdccd05b94fd49bf0513878f668a0123379adabe5b37a2b5e337bccd9906667ebce2f116837c1eca6923acbc57e017d9bb588e5ab40807d +EBUILD reg-0.15.4.ebuild 836 BLAKE2B 5f6e3dcef97cdf67fbcc9d07b02ee66a611396fb98831f192e25e5af90fd8c01b9c15f4462008eae7f87174111a1e1f6902237380d7ffe49d151e5525698e0f3 SHA512 6e63c4018a663d0b65a35ea71cefc7dd4d62e3e16c2bc4c79cf38c25a5a2c9f07345f70f3267a356d46214a3092373651692d337798be8facca2b52f028c3405 MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e diff --git a/app-emulation/reg/files/reg.confd b/app-emulation/reg/files/reg.confd new file mode 100644 index 000000000000..1bd2475decc4 --- /dev/null +++ b/app-emulation/reg/files/reg.confd @@ -0,0 +1,2 @@ +# arguments for reg server +command_args="--asset-path=/var/lib/reg" diff --git a/app-emulation/reg/files/reg.initd b/app-emulation/reg/files/reg.initd new file mode 100644 index 000000000000..7759f44f376c --- /dev/null +++ b/app-emulation/reg/files/reg.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 2016-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Reg server - providing a UI for Docker Registry" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +user=${user:-${RC_SVCNAME}} +group=${group:-${RC_SVCNAME}} + +command="/usr/bin/reg server" +command_args="${command_args:---asset-path=/var/lib/reg}" +command_background="true" +start_stop_daemon_args="--user ${user} --group ${group} \ + --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ + --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" + +depend() { + after net +} diff --git a/app-emulation/reg/reg-0.14.1.ebuild b/app-emulation/reg/reg-0.14.1.ebuild deleted file mode 100644 index 83a59172bdb2..000000000000 --- a/app-emulation/reg/reg-0.14.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit golang-build golang-vcs-snapshot - -EGO_PN="github.com/genuinetools/reg" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="d25a2c83ae5414c8a72f2e1ab96529fb1744fe26" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Docker registry v2 command line client" -HOMEPAGE="https://github.com/genuinetools/reg" -SRC_URI="${ARCHIVE_URI}" -LICENSE="MIT" -SLOT="0" -IUSE="" - -RESTRICT="test" - -src_compile() { - pushd src/${EGO_PN} || die - GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die - popd || die -} - -src_install() { - dobin bin/* - dodoc src/${EGO_PN}/README.md -} diff --git a/app-emulation/reg/reg-0.13.4.ebuild b/app-emulation/reg/reg-0.15.4-r1.ebuild index f22026d1213f..fe202f002568 100644 --- a/app-emulation/reg/reg-0.13.4.ebuild +++ b/app-emulation/reg/reg-0.15.4-r1.ebuild @@ -2,12 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit golang-build golang-vcs-snapshot +inherit golang-build golang-vcs-snapshot user EGO_PN="github.com/genuinetools/reg" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="8dba69bce413988846a6defa063f35ab38a31991" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +GIT_COMMIT="8c930c585418564a4ce472fbbfccb8c5741c2520" +ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" DESCRIPTION="Docker registry v2 command line client" @@ -19,6 +18,11 @@ IUSE="" RESTRICT="test" +pkg_setup() { + enewgroup reg + enewuser reg -1 -1 /var/lib/reg reg +} + src_compile() { pushd src/${EGO_PN} || die GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die @@ -28,4 +32,11 @@ src_compile() { src_install() { dobin bin/* dodoc src/${EGO_PN}/README.md + insinto /var/lib/${PN} + doins -r src/${EGO_PN}/server/* + newinitd "${FILESDIR}"/reg.initd reg + newconfd "${FILESDIR}"/reg.confd reg + + keepdir /var/log/reg + fowners -R reg:reg /var/log/reg /var/lib/reg/static } diff --git a/app-emulation/reg/reg-0.13.3.ebuild b/app-emulation/reg/reg-0.15.4.ebuild index 25b44103626a..2695cd240b3f 100644 --- a/app-emulation/reg/reg-0.13.3.ebuild +++ b/app-emulation/reg/reg-0.15.4.ebuild @@ -5,9 +5,8 @@ EAPI=6 inherit golang-build golang-vcs-snapshot EGO_PN="github.com/genuinetools/reg" -EGIT_COMMIT="v${PV}" -GIT_COMMIT="f143bb56a5d7ade706e45a0d8b59d2f1ca35724d" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +GIT_COMMIT="8c930c585418564a4ce472fbbfccb8c5741c2520" +ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" DESCRIPTION="Docker registry v2 command line client" @@ -28,4 +27,6 @@ src_compile() { src_install() { dobin bin/* dodoc src/${EGO_PN}/README.md + insinto /usr/share/${PN} + doins -r src/${EGO_PN}/server/* } diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index 5fa18cabbc9e..8ce825e18868 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,6 +1,6 @@ -DIST runc-1.0.0_rc4.tar.gz 1090513 BLAKE2B 276303e2085eddd549290e3af1a3af4570d0aef43f66f956267451810b0f0fb77f13ed12fe13b76efcd820fc7e0b46eac370a062f43c8600091a807cb12cf733 SHA512 cc2ae38b96f3f3355d9ba26f7af15c57975276aeaf58dcfe7fe5f0f0411ece8584a7cb51ae7fdd2f4109366f55ac8dfb86f225e26377fe07b685bbc56a2518ed DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6 -EBUILD runc-1.0.0_rc4.ebuild 1256 BLAKE2B 7f7b657ae6f25116fbb7945a4c1e4c3690b736965152be821491ea4fdf4cd5ed5e0b3d7dd1a95607f40706e78f1aadab95b2b5d93324adf0ac7ce94c2cb7b463 SHA512 5236b7ffc8c95960f1590d59bb1dccedb4755aea162c9c5c2cce6239fffbf8a2d951bac4c19bcd513335aa9bff24865f1cb0a1ef2909cdea416d8c18684f96ec +DIST runc-1.0.0_rc5_p20180509.tar.gz 1185576 BLAKE2B b56f9c185c061f51a1fd81c19d378b06c71d06c6eddcbc1c946b234814eb469ea4af37bf42ef3889e4d37bc430e69d0a563281b13055f855f1bc15935531fe28 SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 EBUILD runc-1.0.0_rc5-r1.ebuild 1296 BLAKE2B 837b2acae2f5b76fea1e49c4a49b8149e9f6fe5ac06555f1ec23720ab947d5586f00d333165a2fc200a22caa7a3616976f856bf45db6769db4b991c7d27ec0f5 SHA512 746a2751e39deebac58542a5a4687fd53523046e2b12f5f543a7ef7d891adc145bd4deaaf2e42535651eb608d2b58e5ee2f9c7db64c8c32bd5805934cc8c4c39 +EBUILD runc-1.0.0_rc5_p20180509.ebuild 1297 BLAKE2B c35d2a728996497e77cedc2cab14be52a5e3cc63b109263e101f546ae3af10834f461a3a233b4360285ce1badfb56b74df15abab3744d31c98ef8b612766f524 SHA512 a01ef90ca5f96f3c7a0ddca8a71653766f5c4371aceafa9c52bef38ac0a1d19deff827011b3a52b017363f508f8b4391de57b0756ec50ce3fac6d6e5231f0502 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3 MISC metadata.xml 803 BLAKE2B ece04099f6ebb1afd33a01859d10dbb33f9f3606f262c0741406d3611da2f5841ab2e82e3852bdf8b38b8327920218eaeb43925c873a07a5c3a9ed368d408fd5 SHA512 4d628b6c0b34c18b6853d85a83725036a10b65b5266cf4f8a4df69c79882b03ae2a3c9c9ca1fe209998869e222f64efc6a89a8edc9ff3eec45bc9cb4391efd4e diff --git a/app-emulation/runc/runc-1.0.0_rc4.ebuild b/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild index 76500c6dd5e5..6447ca4dff6d 100644 --- a/app-emulation/runc/runc-1.0.0_rc4.ebuild +++ b/app-emulation/runc/runc-1.0.0_rc5_p20180509.ebuild @@ -9,9 +9,9 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_/-}" EGIT_COMMIT="v${MY_PV}" - RUNC_COMMIT="2e7cfe0" # Change this when you update the ebuild - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64" + RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" # Change this when you update the ebuild + SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" inherit golang-build golang-vcs-snapshot fi diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index fd8548b1ecd5..2377d389ee43 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,9 +1,9 @@ DIST VBoxGuestAdditions_5.1.36.iso 59596800 BLAKE2B c735a88f534b27f1f2f29d125d0fdf881285f64f7ea3f49a0bc9211af4f562562cc321983c222e6106459f3be14af94a3514765607d1cd8edf6e6352398cfe8c SHA512 08049007589f6bf56c84355b908355289f37eac8cb01d970e46ebe3b44b43ff406c37d0ddad245dd007447a00927a2d2312524e3ac99f8b6bad8695b403ca846 DIST VBoxGuestAdditions_5.1.38.iso 59611136 BLAKE2B cde4ceb59159827304c99ab00fac4cd3598600c252e7b5a410a5be6ea50866ed2efae4ead9e5c4c1a1462b1cd6db973bd4b35b56d426934e80898837c536e778 SHA512 e082e6363e1e6fa8a7b6b6b4847e9f2ed17655b0ac143467553150f910d71e4dfff55686c38464dc60f77c57292610d13dc25ee5423877173467a86cfe232a3b -DIST VBoxGuestAdditions_5.2.12.iso 57976832 BLAKE2B 3b1485da265a9d7bd659e846ceb9e3e8f3463816f2f8157654704875e9b7a91d6f610cfa6285d9d54b06e87ca4f3e5d4600b26ac622b592c90c42bde0cc0f2ee SHA512 276b6348942bb82f68dacdc957590130281c5b3818d47c60238e00e1015682b5a44f28091163297ea052d327f916ed2e79bc32820f39f8b8e5dab5bd0fccbe77 DIST VBoxGuestAdditions_5.2.14.iso 57978880 BLAKE2B de5cb3c5b7e2f3ee018588308573389fd973820e87d5b2e6640499c96dc21db95e71eb4e5e2469455febba8b2ccb4a7c6014176e784613218fa7eccabefe9e53 SHA512 1fd878f9e7fc1687907ac8dff6827bfd7aefe3ed48012b0dbbaf42ced21695ce52be6fe146128a6d1c67c7a0c5c39c9ef24e8ee562271fda117d13cca81427cb +DIST VBoxGuestAdditions_5.2.16.iso 57976832 BLAKE2B 78c8d71e2a68306efaf2951d73099b7199e15d83d9fc2c70f73266fdf59798948b22815234a5e30eff43471fcb8a5967c74a439d79b5ed47971dd170498145de SHA512 f25bf8ce789f640e5a80ac55c5d1918702bfed711aeacddc951948dcb56a4aa43a5a4e8760e3b8cc6e18eee18eabff032dd8fff8b95cc18bc60177b0a481b592 EBUILD virtualbox-additions-5.1.36-r1.ebuild 729 BLAKE2B f792450477b1a6b5689018926bce6a30608b288db6a9f546ea52bbc2dd463ba1c71c5dbe4a4970bce3a7dd3d92d6b9fa1e30ffc288f7a4597214021b6bacbde9 SHA512 3d90155e5c821b4831a31a154cbb7fcc31dd2b88637853b5dc8c3393158f555d1b6c3b5bff1856b363b12cd6e6ee039e08dec1aace2751ad618aa719dfef7074 EBUILD virtualbox-additions-5.1.38.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db -EBUILD virtualbox-additions-5.2.12.ebuild 731 BLAKE2B 4784dde2f78825df471f012b87a1af33b1de8c1ed38771f9063eaf03fd186b3410c373012044884107fc9645ad97ccabcb80643215a02754d357fb4b58c68309 SHA512 e0b2b41a355e2d46efbc4205bf7721fe0d8647e479200e93ebc1576b5cbfc1609a4dc35b215798006a53e45908908f75366919226b05527b6cad7647d06b03db EBUILD virtualbox-additions-5.2.14.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d +EBUILD virtualbox-additions-5.2.16.ebuild 715 BLAKE2B 62ab7ae8b0a0fd236b4ca76a01948c1e5cd55def6e61983e73e7270e5cf45a7e679157bb9b0dd82c6fdd159d0a4d03d24beebc3b5c0ba24a3e225b65d52c9340 SHA512 92ad5b98e63888de898eaa86042fcd306b9a97502dac4805da502cff8e0462828200c09cbc59ad110508527ca830a288e311d15917410b42fdc7729ac2b2f49d MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild index a28d6005cb4f..93e9fc9b6d49 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.12.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.16.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit eutils +EAPI=7 MY_PN=VBoxGuestAdditions MY_PV="${PV/beta/BETA}" diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest index a94939c08e86..901f92df117f 100644 --- a/app-emulation/virtualbox-bin/Manifest +++ b/app-emulation/virtualbox-bin/Manifest @@ -6,22 +6,22 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92 +DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce DIST VirtualBox-5.1.36-122089-Linux_amd64.run 88329683 BLAKE2B 96e0296243056ebaecde4435fe68f82dacfc66a0d23b70365c7495112672b60be7682ef794851b68198d0d0f01ec84cb314f06b434726e5f75e47751771cbd3b SHA512 6c62c642da78561ec5130e18ebac24d52871b4c518ce507f1deb0a279c58dfc1b87c4afecf63236e7274da65d5d784575779ad39e17a4f8b1f05c29a3ca95d55 DIST VirtualBox-5.1.36-122089-Linux_x86.run 87449039 BLAKE2B 826071838fdb7567ec7064eb6db216d9d695f3504b0c37b2db637df5757ece58b8c1c0b430cef1c1e6657bd9dc556c074891732cd4481243af72051f66ec6bec SHA512 c593483949a5389cddbe47fb3d07e7acc55868671d72ccd696e1c039ace24e7b88be9cf088c32b419c5f4ba76ceada6e388b63dbeac6376b13627543c472afe8 DIST VirtualBox-5.1.38-122592-Linux_amd64.run 88329683 BLAKE2B 124b1a3d45b0aa213a63ccc225570158faa11adf51a9bc503c014a302ba6a9739e9b50780c93ca6b8704e4666f809b97d1548db74817020301f560252bf71182 SHA512 963ed0b5555bcc43a72dbf49d3d6d9a1a2b1118808ea601765ce102ce72a05439903247680d0b49df4d15cdca68b40a8c5a26df9340c24ed681c3353f2f8e072 DIST VirtualBox-5.1.38-122592-Linux_x86.run 87449039 BLAKE2B a591a64422cd6e7bb292aaa0f35e5ed9a722b3d835800b2ce09814f2756f088e3a7adc0fc483f2a6ec36e265aeddf6ecfe1aa1bf60a78675696859bff1d0afb9 SHA512 41f9aebbb7c4ad6192cfef57ca956c5ec4b96c8547380abc3b56629c821094ccb28bac69645042e0ac22664db6c59aeff49ccc80d88e1eae5ffb95f55a467a07 -DIST VirtualBox-5.2.12-122591-Linux_amd64.run 88677843 BLAKE2B 3fd56527c106193ea0bb46ad51968c59d1bb6453282ddfc84b08227e0f5ed4af941bc11030edb3a0c2d0845d602c036e033a48af020b80ba225d626a3514d321 SHA512 682e42ef3bb65f0e31e08fda2c2a9ce8b555ae8978692b22e9855c1725e5fd3e3db126501df37849b546a5022480a319db12470d1fed44463f2e49144a6383ac -DIST VirtualBox-5.2.12-122591-Linux_x86.run 87827919 BLAKE2B 7efc88298b8e96f0d45cfac3d4fd3b24ffc725f14e1ae822dace092abf6a460cbad4349b907c08998dcdacdfdb915a2de6e8ae8db4edb1842c29941faa6acdd8 SHA512 e6f6890baddef29db0c103569d5abe7bdfb597840e8c9b023ba041b85a7c3ba7bf45f983826266722b43fcca95b2e93bfdc944c25ffcf6f0e386794f22eb5e8a DIST VirtualBox-5.2.14-123301-Linux_amd64.run 88749523 BLAKE2B 5a2791a1258adcdc82f8776fb0d5502d525faa0083b808f1875f0c61b848aa371fa0b6b73ca024c244b36dfb074a8839747ad27a87cb8dfbaad09096a0cec887 SHA512 8c4633ef0e3a9f7f26603009a23244696a6f91baffa9777a0daf8f09abd80b4aca944dabfd2a10acddf4759e64ec719948d73ecaaf187a60a15e097467060ea9 DIST VirtualBox-5.2.14-123301-Linux_x86.run 87776718 BLAKE2B 609c24ad2ba5b005f7cb619fbe2c2a82f026a7ae4ef74cda800c526c8c3552a2a1ed1af5a2a2b3d9c56f0dfbcdda493c2cc92b58156cbf41ebfb1d43bfee8aca SHA512 820c2b6c97a48c125b69e1f749a3b1473d5fe672726ae2cec30f20a6652186a28b3900d4aeffca701415275229232925d1c8c347aefa7a86840a2c5bf13f21a7 +DIST VirtualBox-5.2.16-123759-Linux_amd64.run 88729043 BLAKE2B 0bc183146cdafbd5b12c4d46976cd3775a4ea11aaadae155d979ef81cf04ae8c77d6b48d0e240bad3bd440f532530e6d7584f58e7b29161a0f355bc8b7c15061 SHA512 c815a025376d86a5bed753ef8b729155b2a01d9e4c9b573e70d3b4f7db497285b991b278504d4b4fbf382a00080974551f214176c0e3fbaa2679534b3ee32b90 +DIST VirtualBox-5.2.16-123759-Linux_x86.run 87756239 BLAKE2B 911ddf8b260ce18ff12c9cd6675105327b9c5916f436ee7421db3362403ee4960a8e24a6c25348c7188becdfbbfe0685f42a84ac166e39a753d4407c04721248 SHA512 9b52faab1ecd9e30cbf37fbec1a9a150f3dabb47ac62f355ed67744a849f07c52885852c310c39d9d36f90461fb318f8923afde9ec81bd754c1afbeeb2788427 DIST VirtualBoxSDK-5.1.36-122089.zip 9864160 BLAKE2B 0db3d44c44f93a80607791f2ff5cbdf6aed2b324c207bb9bbc808b5cc836f01ade9c48ed3474c4f174a43b29969fe632b5ccd2b3ad0af197894d63887144bf0c SHA512 98f6e59a5e344bf23f6af6c0e791f28920940de907721981c99b66b8e7c20cb06a7e1211b2029a1279e583fb4ed456019005c2bf3a91b3d8b3fbd61e6e44c914 DIST VirtualBoxSDK-5.1.38-122592.zip 9867112 BLAKE2B d3deeda2adafcb675370c7228f49a209e5f76986fc4c9ac5aa8ff2e809912f458c9cfc2d8f011404fb4bd7b45b80f0ff857dd85dd597d622971a2556c6b17bbf SHA512 e03fab6573e61f59fc4e017d8c6cfde08e734939efe6c2f8edc5e6e9da5a1d616012cae06d630a3e2a2b1d72775eb8f0a05eb230fa81321ec33ba1975ec34ce9 -DIST VirtualBoxSDK-5.2.12-122591.zip 10153856 BLAKE2B ea4fdc39744e5fcc2edcdcf521c795b2669344cec4be2b7d9f08d1e0917c24b5c06721d76d81966c611ee41d220095aeb6bbab211a0e1b52e6479e0c9595d97a SHA512 6d7e3968c9edb00b88aa5118ec9c74ae85e04d788f49741b68506b07307c4dd2c8cb7bb307c76f9d2908bc47c7683257f39395008b0a03eff72a1e77567f0e77 DIST VirtualBoxSDK-5.2.14-123301.zip 10154044 BLAKE2B 273219029c59ffd685fffb7e14fff914a5397acc0676c8b4ccaee9cecee51e90880e68d883125e061d6c02e09b53235821ff89a265e937c9b4e67365452a97d2 SHA512 c69e6f537af611b9a4bcbab3e014fa25c6593f754940c6596e451cf895cb088186d037ac4816a3bae793213c774befd54ffa86d43948fa546f753a37fcdabd51 +DIST VirtualBoxSDK-5.2.16-123759.zip 10158952 BLAKE2B 66140092c221b998919a3840745e2ae58671b65f1db774ddb6691d085e95a35cdfa1e939a84cb032e2f67bd4485bd8f940f5db6d3712569942cbcc2a0f1bf234 SHA512 2b735016ea99e94317876f2e845cf94dd845bf51a86b42e938cae4bee003483f6061a7d89150f3d1fe5b84970a4fa83ae5bed7acf6570b849df5258efc8eb38f EBUILD virtualbox-bin-5.1.36.122089.ebuild 8381 BLAKE2B 16a4aed3c9ae0fe4621fd97d30ce46808ff7c56783dbc27e2a4c2e6a6a1f290506d71659ad98c4def219d75789ff6f7f66c8d79ff90d2285ca0e1fceec14635a SHA512 a5cd6523a8a08b64f7d60ebd00d56576c7dbb33dbde06dee28b56ae1a31648a3155b7a1f3c3a739e71fa824d427c33b74ccd31dc1fb3520256b759c0e79dd193 EBUILD virtualbox-bin-5.1.38.122592.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b -EBUILD virtualbox-bin-5.2.12.122591.ebuild 8383 BLAKE2B 0f07fa4a3383dde55f6ee12bebcbc44da33f96c498dd58eacd8dc1fd19bded41f720be5400e2ad9dcd01d80752a9825f89b68ca610105362d1eeffd9e2395c85 SHA512 96ac84742f050251faf70537d768654a21dd9f918ec282ca229f5490071e9d0aa7dd3dda3121bf39534f0f1547b039f1f138a15b1d5fd4b85bf5d82d79df216b EBUILD virtualbox-bin-5.2.14.123301.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e +EBUILD virtualbox-bin-5.2.16.123759.ebuild 8332 BLAKE2B a7ca997e4da4bd000ab990d0aad48c32ab87806d82ddff744c16c9a1d1351f94fe76d640f74cded7caa66925e985a0a8e5930e9266dd67de522d5ec65a212a13 SHA512 907d13a5a2008872f3a336532064c297253f53877198ae95531f06bdc823d789d91d88c2d0a3e6a3c3fba9dd7209512b0805ecaeeec741f3b828acbc3ba2d59e MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0 diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild index 94de7dd7a102..424d6d96060f 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.12.122591.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.16.123759.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator +inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver -MAIN_PV="$(get_version_component_range 1-3)" +MAIN_PV="$(ver_cut 1-3)" if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(get_version_component_range 5)" + MY_PV="${MAIN_PV}_$(ver_cut 5)" MY_PV="${MY_PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" else MY_PV="${MAIN_PV}" fi -VBOX_BUILD_ID="$(get_version_component_range 4)" +VBOX_BUILD_ID="$(ver_cut 4)" VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}" MY_P="VirtualBox-${VBOX_PV}-Linux" # needed as sometimes the extpack gets another build ID @@ -207,7 +207,7 @@ src_install() { for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do fowners root:vboxusers /opt/VirtualBox/${each} fperms 0750 /opt/VirtualBox/${each} - pax-mark -m "${D}"/opt/VirtualBox/${each} + pax-mark -m "${ED%/}"/opt/VirtualBox/${each} done # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl @@ -219,7 +219,7 @@ src_install() { for each in VBox{SDL,Headless} VirtualBox; do fowners root:vboxusers /opt/VirtualBox/${each} fperms 4510 /opt/VirtualBox/${each} - pax-mark -m "${D}"/opt/VirtualBox/${each} + pax-mark -m "${ED%/}"/opt/VirtualBox/${each} done dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox @@ -228,7 +228,7 @@ src_install() { # Hardened build: Mark selected binaries set-user-ID-on-execution fowners root:vboxusers /opt/VirtualBox/VBoxHeadless fperms 4510 /opt/VirtualBox/VBoxHeadless - pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless + pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless fi exeinto /opt/VirtualBox @@ -249,9 +249,9 @@ src_install() { insinto ${udevdir}/rules.d doins "${FILESDIR}"/10-virtualbox.rules sed "s@%UDEVDIR%@${udevdir}@" \ - -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + -i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die # move udev scripts into ${udevdir} (bug #372491) - mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die + mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh } diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index e0fe9bba721c..89be27bc8841 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1,9 +1,9 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.36-122089.tar.gz 19605234 BLAKE2B 4b263b27b130e5b5d7917f15f0dc782f28f7708cc10e22028ee27b33be6541df5211c4fb36951a6b293d19b8933182097cd0575da8c1d00b6a96e747c1962762 SHA512 e11b294da83b4605c40132f2ea5f95f2820f901d2ed1d438c22c4cc9f779baa3112b9334036717d1593d5f9ec8374d7d7bc826012e2019ef0ba79bacb1deb7b8 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.38-122592.tar.gz 19717251 BLAKE2B 90dcaa58284c6dc9101dbc8eb9ceda55d16c4a48fd58fb43c4a6b7d3d5c582c31930f6e773397ae9379e75771c88b40aad276436bb1d56a71a8e744353e04ec9 SHA512 ba44d53e06adababd0ac7c8a68ea025e1e7afd39fe648079bbb879e81130d45f00b944795cfd37f7f05c16d5a7723b85c49a8435c8399180af627dd3b3de00bc -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.12-122591.tar.gz 19590585 BLAKE2B 433ae630e55f2320d48c06d0fd5120528ee10c04f2e471da3a72fb98ae826b2909fa5fcd2a4ad7c875a1785d07c0a3dc9ec3001fa7d16903037731dbe1e24a75 SHA512 3e55cb2c8a5adfdac988b81804650aa35e66e052a946b371d61a92d459e5dbb83495f80423f22cfa2a4c2196cf94d1146ff5aed621985f27f2e5069c13f5daee DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.14-123301.tar.gz 19589209 BLAKE2B 385bdfb4cef67788a1dd3e758f52dab7a367f56ca8d286e465af9a7674ffe3bc0f6187a66d7d19bb8f2a8fc0e23e0ce7ef35ac2d46fd6971dc2df96e8a61ca11 SHA512 a47a7173685b72995e5012386fc8f6c55f9106049a28ecaea223f58f1bb40077e0929cf05102a2588e516fe90891428b8e569ec9351fcaf235eb9f8293e45b92 +DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.16-123759.tar.gz 19588810 BLAKE2B 51fb01ace72f6bc3f0e1ab6804c44ca44463ad24986af08b79c41bb06f43776c9f022d1766d07a4f9a47615119963636cad52d8f7d7bcc9f5e58f51c093f0bcd SHA512 8dfadb83111226a7bbc522d1caf16327051d76ee9382cb62281df5735f87d0e26994dd38a279027dae27c0371120bf95066d5260e79003c5a8982710579ecbce EBUILD virtualbox-extpack-oracle-5.1.36.122089.ebuild 1087 BLAKE2B 6c233d604a66c0abd454b537e5d374210a83e8a6a1cff28ab07d78af52fd94385f7eda46c9efa320b53f2deb2f6baf6d3581a0ab56bac91e841f074585d5d3c5 SHA512 ce18fe7011e3d6942d4718617d2d1218d19e50bc8fa80e03db4c78a2d16739a6dedee75de58bfaea6a28b45010cc26c8fda09d85ead4e69f229911c5a7f61e05 EBUILD virtualbox-extpack-oracle-5.1.38.122592.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb -EBUILD virtualbox-extpack-oracle-5.2.12.122591.ebuild 1089 BLAKE2B 89bfe2611b6f560d44f12abc203e9f3fabdd0ded2c9c6c6315509c989897b71acffa3fa0c33cdc3feb51ffcdcfe3a8daff0dedf13d2360a1f447328978f45673 SHA512 714732f55a0ed46ce33a89a0170247be72d06f0832ef0a0d5adc282a560111842d77898096fb768a63acb26e8e96962d0ede3555bc13aa6ad5985f611f3de8bb EBUILD virtualbox-extpack-oracle-5.2.14.123301.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece +EBUILD virtualbox-extpack-oracle-5.2.16.123759.ebuild 1010 BLAKE2B 476281386029dc67f5ee851d33a3f35902e7afc90a216fde7f611af20d2445cf53d6d2e356b9334e7db9861a5ea53c1cb5b0b14aa029094a6e162c1fe291875e SHA512 4ec9f04169e5b60ccd2020d888fe0340c921afa363d4484c075aeaa02693906ad0983c0c1836cc80f6f8eb0da3b875e0c4186fe76a75d8e7262dc3a0fdf7eece MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild index 7d7d5d2ea35c..d46e764cf177 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.12.122591.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.16.123759.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib versionator +inherit multilib -MAIN_PV="$(get_version_component_range 1-3)" +MAIN_PV="$(ver_cut 1-3)" if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(get_version_component_range 5)" + MY_PV="${MAIN_PV}_$(ver_cut 5)" DEP_PV="${MY_PV}" MY_PV="${MY_PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -15,7 +15,7 @@ else MY_PV="${MAIN_PV}" DEP_PV="${MAIN_PV}" fi -VBOX_BUILD_ID="$(get_version_component_range 4)" +VBOX_BUILD_ID="$(ver_cut 4)" MY_PN="Oracle_VM_VirtualBox_Extension_Pack" MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index bd4598bd7161..cc3e11207691 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -6,13 +6,13 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1 DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8 -DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e -DIST virtualbox-5.1.30-patches-02.tar.xz 2608 BLAKE2B 08b05a26622a7acec455f6d0dc72858f5f2758488e50d219f83c3d12606419d48e9d99302cde5a275929fe79af900c1b3ea3957fe9dfdaa952aaa0da9933291a SHA512 8a490f7cc44e40262fc47819736251c177adb635256794e9500f52729197c85211d5b0c0d000268089953a4c185872a8ba03c5d42df6b80f05eac8b81335320a +DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654 +DIST virtualbox-5.2.16-patches-01.tar.xz 2952 BLAKE2B 1d23d83bdb4d9576d402b67cc81d4427c5fe9163550d2817546382e1c1087000553d4a9a864f2527a909f52ce389105bcfe5518b5407de1299c7d2a62ee3cc21 SHA512 88c21583c51ae8e22e5fd3f08baae686045e884883153e2e365c35ba19f2773d5964c523a4ad3777fe30ca96bf76fab8819e09beeadf8350193041bff783893d EBUILD virtualbox-guest-additions-5.1.36.ebuild 5995 BLAKE2B c34c1d3e312781ad4a4a390f12e4986ee197a690f5875f829bf3e87fa7a0741d5eb2c08f506d9a5b43590ea762eb26cf516db591a1b55a2f27e5c36f8fc313e8 SHA512 068ae5ecd8aa8e9f30f5272f1a1f58f8da92b78ee0f62784e335ebcbd63605b34d6654bbb35b16d4b4572bce75478827de217aeacc062bfdd7e206d7d38c7bb6 EBUILD virtualbox-guest-additions-5.1.38.ebuild 5997 BLAKE2B bd1110242825d9eccfa7235ce8de8fafd720610652dee85169f9e14c4fa6c806619736ab8db2b4f8041aef0a7fe0c6fa8dcd7a49a488287d8b0677b099894494 SHA512 b28006deb4ebe0bb199296262dec479bafc5a02c239116f2e3da9cf8198aca5fbbb281f6679b8415d3a0ffb88e3e42de4f71b808b2f0c38203af66cdebb36683 -EBUILD virtualbox-guest-additions-5.2.12.ebuild 6099 BLAKE2B 4ef9d7f4206d4c584d505c503cebd317b92ee4b7611b015d91d1390f3b07f29de9c7d1059784a13524e3b033c05afd9589203f19f11b64f1c6f8ca8a21dd3334 SHA512 43964cbab6d17f7133f7387e13058d566f4c461ddb9ea315a4fe726783fd97ba7c4d3dc3e98b0189f31cf946ccf9fc8812c217fbf4cc75de38c5d28a91b54b63 EBUILD virtualbox-guest-additions-5.2.14.ebuild 6030 BLAKE2B 958d03973c922d1012f46631741fbad9d76374b70d2145a2ae388edbb57dbdc40ae1177351b22890fa169e66898dbd3d60cadf391f3c380c2dd814251c68fd2c SHA512 0896bf89ab514354ec6ea50ba528332a4f12e0feed2b18856accc0dc3a5e02f6a1d10912fb076d660bbe9464df7b385b7c6f32daf581f45294b10269ddf2f644 +EBUILD virtualbox-guest-additions-5.2.16.ebuild 6072 BLAKE2B 82dd3e0a88c0d4295eea1be44adeddf553459f799b62af523ff624eb3362d75ba524615bf770fb51b59c007ee86e5cf2db6806975ca384916e1308b6d22d8696 SHA512 7901c8bccce613faa42b2b34209a69940cd323a2b5e98a3fc79d9211c46fa74f1c8d707c0693584de7d47d803890c6bad601fb47e1e5c108132c058b2a10c505 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild index 9a895f357c2a..e694510dc385 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.12.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.16.ebuild @@ -3,15 +3,15 @@ EAPI=6 -inherit eutils linux-mod systemd user toolchain-funcs +inherit linux-mod systemd user toolchain-funcs MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} +MY_P="VirtualBox-${MY_PV}" DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" HOMEPAGE="https://www.virtualbox.org/" SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz" + https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-01.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -57,10 +57,6 @@ pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}" - enewgroup vboxguest - enewuser vboxguest -1 /bin/sh /dev/null vboxguest - # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist - enewgroup vboxsf } src_unpack() { @@ -87,6 +83,7 @@ src_prepare() { use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk # stupid new header references... + local vboxheader mdir for vboxheader in {product,revision,version}-generated.h ; do for mdir in vbox{guest,sf} ; do ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ @@ -97,7 +94,6 @@ src_prepare() { # Remove pointless GCC version check sed -e '/^check_gcc$/d' -i configure || die - rm "${WORKDIR}/patches/011_virtualbox-5.1.30-sysmacros.patch" || die eapply "${WORKDIR}/patches" eapply_user @@ -171,10 +167,10 @@ src_install() { local udev_rules_dir="/lib/udev/rules.d" dodir ${udev_rules_dir} echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + >> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ || die echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ + >> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ || die # VBoxClient autostart file @@ -188,6 +184,13 @@ src_install() { systemd_dounit "${FILESDIR}/${PN}.service" } +pkg_preinst() { + enewgroup vboxguest + enewuser vboxguest -1 /bin/sh /dev/null vboxguest + # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist + enewgroup vboxsf +} + pkg_postinst() { linux-mod_pkg_postinst if ! use X ; then diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index 8c56c09ee6ae..2f8b88a6c16a 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -5,10 +5,10 @@ AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8 AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a DIST vbox-kernel-module-src-5.1.36.tar.xz 628368 BLAKE2B 49a3dfc4ff573f793eefcfd9b645af6fa6fc63b54475921064be146d3d4bf4db61f48d82f62d65811597fa12b88331153f7491890527fde76f41426355552abb SHA512 c69739c72a5555fc3bca90186129fa4eeb5bd930c4396b416a8a88e6f84bcd9e7498a9bbc9381da648cf87d601d98249feac2e4de6d93d8b7aba46b22d3ec40f DIST vbox-kernel-module-src-5.1.38.tar.xz 628552 BLAKE2B 9faa4e837a48ac27be5c0183edcf2b39c08eeab210bd39811704a7a578a93b28f8b8ecf26a34483f2d135a8cb8817756120d7bef0b8de245c5a5e232cfebfff0 SHA512 36311c3ff947fa763db1fc0612c5a4c10ac3d586c3faab3a91e463723488510cedfc1a69696381158a167edfc86d7abf66c18b287ced75cbaba3f1797c4265a8 -DIST vbox-kernel-module-src-5.2.12.tar.xz 637292 BLAKE2B 31b54c8de560a30d228497f5a3f58f868ad09e18051f8fac2257200e324603c5fdfe127d530997f7dae728d13d93ced6321487f20571811352bfbbf1f9c6d646 SHA512 7408e8121bf278050728461d4f7ab4d4b6c502b24859573d4652a58d1058e9b12a4de4b582ce45f7d0b12bf369a7378107c2cab12a6e93b1b082a40d1f2e9712 DIST vbox-kernel-module-src-5.2.14.tar.xz 637352 BLAKE2B 7ccefbb13f25fe995e0f769192a93baa91358c09e7126d6a6c8bef7fceeab50082f78843140d23cf88c4931c561552c4131b17625e7a3821766571387d78d2a3 SHA512 920eca67fb10ed4d1eeab95b14e65c585dd96df82a4690c34c9d85366ec6dd9835f9a772eb4718a80e6ffb2637de2a698151a6bdfd7984fc2070cd0bade5c077 +DIST vbox-kernel-module-src-5.2.16.tar.xz 638172 BLAKE2B 80a27100bb0be97796f03b368c589965d476e6d0c79424b94a5100561dc84bc2baf28b271a744b7b4ad53e015fb463faf2871d24596fafc83c80ccbe16087730 SHA512 35169a46ca9018f169b25359c0f4bf658622d71ea284768912bf0a8d2ac34ecec94f5dc774f77f0c02d1b83363faad53158baac7423f588deedfe8073a1e56a3 EBUILD virtualbox-modules-5.1.36.ebuild 1431 BLAKE2B 9ea7afbf141d43d3c6a22d5bb934bddb1c67a6afa69d65ac905df930cde73d5c8b921b11f4954e3577b6b63a1b1c156d23c97c9aaceeb2fd51be75d81df1d936 SHA512 e5becf1d7298567966b7653b73e3245a9db59b3eca1659890b004d8116a1c150e8c7042a81bb7fd9c0757328895dfe12c39baee9a49375110903d83f6422c988 EBUILD virtualbox-modules-5.1.38.ebuild 1350 BLAKE2B abf66852d4f907de436721b8c8f06dfd3c3676a0676d6e569147e01aced9b6f5492c9e9a2ddaee5798b38aba0fbc8d812179427d8eb7c45e732ef9093542d40f SHA512 e09b4178d5e20260cdd59597c514a4cc7d78b8caa8e126248f213f3bb4a665762216f07076efb6e81b822920a80c09979a94df11a952488397ced662f8862108 -EBUILD virtualbox-modules-5.2.12.ebuild 1195 BLAKE2B 06cf73894136a6dfe80f0cb7b32850bba3590cf72aa23369801bc4f58f7d96d109cb88d4c84d0c00c7bca8b5b17671b5e1478279a79bc7f642b5f3faf4fede3f SHA512 a12223da83f398dacc597d9ff7d0a0592809acfc5033300ead3e5f1ad4672b1527138418db0bc9f16879456d9f136618952e324d42b22645416564942d5649b1 EBUILD virtualbox-modules-5.2.14.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5 +EBUILD virtualbox-modules-5.2.16.ebuild 1199 BLAKE2B 467a7073743e16f5efb3e1a68402bad71bbe6afef8c9ae9f56e2029ea4d517eeafc46576e8149899f8c63cd6fee30e1e20d179006174714309eb4eab29bbe431 SHA512 67ca645212bd521d7655e38c390d346299ecf13e7485e7a269fe1891eebcdccf98c02cd4832ba563c449a9dbf3b11e9d242b1a2c5be6bc7bfb741282186087f5 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000 diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild index 0fd483ae195e..89e331b6d043 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.12.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.16.ebuild @@ -8,7 +8,7 @@ EAPI=6 inherit eutils linux-mod user -MY_P=vbox-kernel-module-src-${PV} +MY_P="vbox-kernel-module-src-${PV}" DESCRIPTION="Kernel Modules for Virtualbox" HOMEPAGE="https://www.virtualbox.org/" SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" @@ -20,7 +20,7 @@ IUSE="pax_kernel" RDEPEND="!=app-emulation/virtualbox-9999" -S=${WORKDIR} +S="${WORKDIR}" BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 3607736ea43e..83f4464a1de3 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -12,12 +12,13 @@ AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1 DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8 -DIST VirtualBox-5.2.12.tar.bz2 118612426 BLAKE2B 685c400ef82de14891d9cc42e94e8c0de270a57d6e69820d45cf7fda0ef32d78d4c2670b4a2b89003d58035ee50d648d7906e58d99a96d40c24ee2fa51a317c9 SHA512 083219501d0103d1060cd470cad5a29a348341abf92c1caccf10e7fcfcf0db163e95d6624614d327dda7500d638d3038634fa8a3c1c441a6ee8de9e4f51325d2 DIST VirtualBox-5.2.14.tar.bz2 118597539 BLAKE2B 5e0a8d92405378eb438cae375041609f7a0e1288b040d3a0bcc06157f16ddd48b3537f2f026aa12a71c5319bdef56d6f3907785ac51ebe05a8b7143e04f22d0a SHA512 b8202eccd83e9f2c92a77548d003082b6b3ff7838bb32ae48c3a25dcd622bfdc8ceca42cc49b855eeabf4439c55ad42df9b3959dd1bab77de154468e139c904e +DIST VirtualBox-5.2.16.tar.bz2 118678441 BLAKE2B 9d912a51ceb69eb117d9886adf34fe4900bd941637c0610e0e0febb650cf7817b6f2fa0db4b085c0cb28c56892e7f8678e3533d7384cd155e356fa4a0ec7c0fa SHA512 361607c43e3f7fb60da6db898951317c45a7f7b782c42808759f7c29502e3778ae28e5a54b5c49d1c5e46d94f85dbd1891d69f16d756767f0155bb48531b9519 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2 DIST virtualbox-5.2.12-patches-01.tar.xz 2616 BLAKE2B 5731484d185414d83588ee227bbc1eef266451d1a3a710adf1b769cd6404ef1750dba7a60549f2ab9f3fb81ef15809db9ea0190127caefc72d7bc9bb8b741fb0 SHA512 712b55392a8e8357e95abb42ea4f8dac3391ecbf9cbecf27c7dbf674c40f42a1eb19d227a1b3adcf621384a9f64a6438d20fb43866c736189097fb5770c5c654 -EBUILD virtualbox-5.1.36.ebuild 13739 BLAKE2B f5f6922da32d136ca9ec5df87db2bbe02c0a31ff1de2e6bd6de65e27a5a002238fe83ecf78ab66bc497df1789d251d15e4cd425cb5880a4bc69de20a50989729 SHA512 db26894e87c078a675f71f200c380f6e40ba8e9248a4e5119d6a49747b9bd35dc6fc05614b330c255784eab1ab2cd3fbd41803765257d35f81e396f549df19f6 -EBUILD virtualbox-5.1.38.ebuild 13741 BLAKE2B 3ef2174630759483ad199bccaa4bde5a32c633f13f5a601f089291982f4b8199b23182fe9edba927016d44a3188df8f5145d2718059f32417d65108024950732 SHA512 be794585dd46c608accce3c1a95627c2ad0d8681bdb2d1b71be97a67f4621aaeac870d7f72dfc9fb0e29e6910c8173e2079548348ffcc8d08c6bec028faf522e -EBUILD virtualbox-5.2.12.ebuild 13730 BLAKE2B a3a4f6d1537aa993761d29c32075acc420b2f5e03317ac5ef502df5e3b908c09eea773ed86970c16412c81ce8c59a9edd6782d0da2ad66e09a366a21cd735fc3 SHA512 d539a30eeb9a6e873fc246a0b6bf17d2d84bd4377cc32b290c7d51ea35b4e73b41cd2b47dea1412026c636db859739d740772ce59bdbadde0504b277daed9422 -EBUILD virtualbox-5.2.14.ebuild 13753 BLAKE2B 449890faa5dc94a32ad07c8731548b1d4967071d1b19df016893e5bf79093873896e2c19a38beb13fdb9eaec2817fa566a3db74e31162f2f64df286374a1b127 SHA512 43b1f412e6724283e908c82005f43aba2bbb3dbbe0401b629983bc896e8a81d10163127f2cb6f5f059b76fe4b88d46cbe6f94ab136dbc04904bda90f9c575f72 -MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2 +DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450 +EBUILD virtualbox-5.1.36.ebuild 13795 BLAKE2B b988e0db6a107ae6f5f736dd42472e6d3484c5ca99834039156eeb72ef399bc17e06a0d635cd993070450132e4fe847aa0d3b3d4b300cc5fc35507034f4f1fc1 SHA512 5d0cd2e29ebc2603deca6ededf55db38c087a5ecd0245a131fdbc52ea00b293da8f741fb1a44677b39259932930485c27821ea9205ff391011541688f014c01f +EBUILD virtualbox-5.1.38.ebuild 13797 BLAKE2B efbb490230e3ed1468a397ba3257334bbfa7274e609f2d2c9b454e5f98458c6c78bdda845bf227edc59fda60afe92a0ac3d0e07473619166292c30453ca7c9a9 SHA512 e201534862e708eab0088e08b92b524db3723d6c2a4153507b7f760d45d4f85bb2bf4823d145ecebe7fc12ad06790a2b612e9efae7fa85de950a3147e58fd45b +EBUILD virtualbox-5.2.14-r1.ebuild 13841 BLAKE2B 214d86ba21c8885d3e93641423557017b442b3ed19b9effe2247b0ac7df03d47184068430a97dcefd2ff23c4cea2fb9b0a2298a37538b6a09a47a4d84083d1f2 SHA512 060ecf17a73b3f3a6c45044ffcb1419459e307c6775b15e46368138120d024e2f53bae36da2634293d4922c3bcc416418b980af132001f6b8cbb31e7a0d7b278 +EBUILD virtualbox-5.2.16.ebuild 13908 BLAKE2B 400edf7c47f640eadae99e040afdc8fbf5bca74765998da8cae05f20cc5890b3630e4ec6d18fb7b3d12caa4286f28b96afba901bd833945f9c14b148aed632b9 SHA512 69cc9c884a3080d9b2604779c571d754224ab8ccb8f2ce3aa7bce9032a716c8669576403fc228d67e8057cb2d87c806de65c4d9392e57992d0c6db40e41560a4 +MISC metadata.xml 805 BLAKE2B 6ff816d3f6e3f51eef32f3695c7892d5be15dbd544fb384404c1409f5297df60383b3f956166230a6f6f7094647093cd4c08b3258017e0513504d74f785788f4 SHA512 5f13d0dd36d8bd45ef142c23a9a60128e31b4f40b388fee30e465100c1ee61172db4d1888dc93363f145181cab40f56ce9ae7c14b8d9f3cc91f076be86099eea diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml index 0c28b5e71973..e75aaef2f83e 100644 --- a/app-emulation/virtualbox/metadata.xml +++ b/app-emulation/virtualbox/metadata.xml @@ -8,6 +8,7 @@ <use> <flag name="headless">Build without any graphic frontend</flag> <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag> + <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg></flag> <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> <flag name="sdk">Enable building of SDK</flag> <flag name="udev">Controls installation of special USB udev rules.</flag> diff --git a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild b/app-emulation/virtualbox/virtualbox-5.1.36.ebuild index 0e61d6f6497e..b16e1523f1a6 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.36.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.36.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -422,6 +422,7 @@ src_install() { } pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update if use udev ; then @@ -464,5 +465,6 @@ pkg_postinst() { } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/app-emulation/virtualbox/virtualbox-5.1.38.ebuild b/app-emulation/virtualbox/virtualbox-5.1.38.ebuild index 73a8fc1d5787..82fd4f21ebc0 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.38.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.38.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -422,6 +422,7 @@ src_install() { } pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update if use udev ; then @@ -464,5 +465,6 @@ pkg_postinst() { } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/app-emulation/virtualbox/virtualbox-5.2.14.ebuild b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild index 72fb052735f6..25b19f71be1c 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.14.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -356,6 +356,7 @@ src_install() { insinto /usr/share/${PN} doins -r nls + doins -r UnattendedTemplates newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop fi @@ -422,6 +423,7 @@ src_install() { } pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update if use udev ; then @@ -464,5 +466,6 @@ pkg_postinst() { } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/app-emulation/virtualbox/virtualbox-5.2.12.ebuild b/app-emulation/virtualbox/virtualbox-5.2.16.ebuild index 6b5234faaad8..cacca024750a 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.12.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.16.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -13,12 +13,12 @@ MY_P=VirtualBox-${MY_PV} DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" HOMEPAGE="https://www.virtualbox.org/" SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.12-patches-01.tar.xz" + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" RDEPEND="!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} @@ -50,6 +50,7 @@ RDEPEND="!app-emulation/virtualbox-bin libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) + opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 )" DEPEND="${RDEPEND} @@ -210,6 +211,7 @@ src_configure() { $(usex doc '' --disable-docs) $(usex java '' --disable-java) $(usex lvm '' --disable-devmapper) + $(usex opus --build-libopus '') $(usex pulseaudio '' --disable-pulse) $(usex python '' --disable-python) $(usex vboxwebsrv --enable-webservice '') @@ -279,7 +281,7 @@ src_install() { # Set the correct libdir sed \ -e "s@MY_LIBDIR@$(get_libdir)@" \ - -i "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" + -i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" # Install the wrapper script exeinto ${vbox_inst_path} @@ -315,7 +317,7 @@ src_install() { # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) # VBoxXPCOMIPCD (bug #524202) for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${D}"${vbox_inst_path}/${each} + pax-mark -m "${ED%/}"${vbox_inst_path}/${each} done # Symlink binaries to the shipped wrapper @@ -335,7 +337,7 @@ src_install() { if ! use headless ; then vbox_inst VBoxSDL 4750 - pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL + pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL for each in vboxsdl VBoxSDL ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} @@ -343,11 +345,11 @@ src_install() { if use qt5 ; then vbox_inst VirtualBox 4750 - pax-mark -m "${D}"${vbox_inst_path}/VirtualBox + pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox if use opengl ; then vbox_inst VBoxTestOGL - pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL + pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL fi for each in virtualbox VirtualBox ; do @@ -356,6 +358,7 @@ src_install() { insinto /usr/share/${PN} doins -r nls + doins -r UnattendedTemplates newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop fi @@ -389,8 +392,8 @@ src_install() { doins -r sdk if use java ; then - java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" - java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so" + java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" + java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so" fi fi @@ -422,6 +425,7 @@ src_install() { } pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update if use udev ; then @@ -464,5 +468,6 @@ pkg_postinst() { } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest index 98b6faa7aef0..979330e5ac57 100644 --- a/app-emulation/wine-any/Manifest +++ b/app-emulation/wine-any/Manifest @@ -14,6 +14,6 @@ DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2 EBUILD wine-any-2.0-r1.ebuild 20915 BLAKE2B 7ff1002e303dd2a083267fbf24e4b6cb0e3ff620d6bbf78b8fb15d66fb4d11669812233f1edeea0f46e75b9a0c8a9e63244aa4bebb594b95d158d55fc2506e6d SHA512 8e1bd0d4391f1e9336f9c39ce46d97f921f70cae75d961bc8fe8c7ec6c51bbba621c19a3171f0c351ce6e038d37a7f9a73f6f0bb4622f176e5a994e4a989b2e7 EBUILD wine-any-3.10.ebuild 20939 BLAKE2B 6398dbe0506755239701eaf5cae9f2cbeb6d72376430bc018f3dfd03b374d06f909879b5c965a0b7fc1fa7be1b1668e62cd64e836cf8a6163c2977f17d6bf472 SHA512 23b1c71c7736ab423747ed69c9f5b591cd569bfc81be48f5d0d8778acc010a8bf3f95f51c4b975026a9670d9db2160bdf7b709e64eb48e8f3586883eeb034ae2 EBUILD wine-any-3.11.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820 -EBUILD wine-any-3.12.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820 -EBUILD wine-any-9999.ebuild 20850 BLAKE2B 602ff47811c6b486aa28f338d6b8838b303ee9b0078b6d7b775cb62c2fa3bb864ac9c4ee39122be4c4a8f40de72b512e701fe8ec83ab27463a7df4c7c5fe6b67 SHA512 0240bfd7bb01322ed053118fd3a65cec336493e33ecbb8f5db10505e8500a50b4136e2d323ce7af3a58c53396e2c7635203fddef21343924007e59c519ee8820 -MISC metadata.xml 3853 BLAKE2B c5e0b577bb1af561b8ee2d8adaa4dcd249e517ccba03d7b832ba9b0626108c9c3ad3c9ca9988eaf19ad2ecdc6e9fc61a3a992d92ff697d48eba8d45d2c338dfc SHA512 738bd810704414e76668e8c46d2eedc884df93493d94391f38c8dedf4a97cfb36c7f3c8855973c7c07382883be81d6919b3ea634bf7f6b919f6ec22b5aff6898 +EBUILD wine-any-3.12.ebuild 20957 BLAKE2B d31df15a6217a94c2ca9b0a6f377dc41d39d400bdc3c67a5d7b45274085b1ce6a362630a7f1fce1100d5500d2ca79042a00faff7e64213eb03d4b18067bc2686 SHA512 dfb9c90b227a78cbd939268e65ae2641bdc06d5e7b1b80d97b707c30cd9b962a2eeb1c2651eb05bbb6284ec2b42791d066dac6d469301d597529f3d2860d46b1 +EBUILD wine-any-9999.ebuild 20957 BLAKE2B d31df15a6217a94c2ca9b0a6f377dc41d39d400bdc3c67a5d7b45274085b1ce6a362630a7f1fce1100d5500d2ca79042a00faff7e64213eb03d4b18067bc2686 SHA512 dfb9c90b227a78cbd939268e65ae2641bdc06d5e7b1b80d97b707c30cd9b962a2eeb1c2651eb05bbb6284ec2b42791d066dac6d469301d597529f3d2860d46b1 +MISC metadata.xml 3938 BLAKE2B 229f46077b9df226c74b9001708696aec52d9d52cc14707caae883e6a8d4e16c7cb50cba84caa6c17ff13ff26d3bdc1327630dd03263922c0ca1e79922e8614c SHA512 c3c2d969dae75796e689395def7e18cd3c7988b6fee62841757a616f288a05117ea2fded37d71a5cbbe1fb59df8ff888a764230c218fcf98f2b9ae84e320d07d diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml index 928f2a8c2b69..ea740bb3f7a6 100644 --- a/app-emulation/wine-any/metadata.xml +++ b/app-emulation/wine-any/metadata.xml @@ -27,6 +27,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs <flag name="d3d9">Apply highly experimental patches for Gallium Nine support. This patch may break some applications.</flag> <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> + <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag> <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild index e713de98aba4..6380a95584b1 100644 --- a/app-emulation/wine-any/wine-any-3.12.ebuild +++ b/app-emulation/wine-any/wine-any-3.12.ebuild @@ -48,10 +48,11 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) + ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -80,6 +81,7 @@ COMMON_DEPEND=" x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libxcb[${MULTILIB_USEDEP}] ) + ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -458,6 +460,7 @@ multilib_src_configure() { $(use_with cups) $(use_with ncurses curses) $(use_with udisks dbus) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index e713de98aba4..6380a95584b1 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -48,10 +48,11 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) + ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -80,6 +81,7 @@ COMMON_DEPEND=" x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libxcb[${MULTILIB_USEDEP}] ) + ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -458,6 +460,7 @@ multilib_src_configure() { $(use_with cups) $(use_with ncurses curses) $(use_with udisks dbus) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 5145b3343ed0..fa70220c824c 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -10,6 +10,6 @@ DIST wine-staging-3.12.tar.gz 9936375 BLAKE2B 5c48fb1037d39ce6ab78c03a002b2edfc2 EBUILD wine-staging-2.0-r1.ebuild 19947 BLAKE2B 44adc4926d0a93bdcb8ef176d0c058eb2a7ec6896ebc00f253e417f541fdd14e7236e4c1123b8aa93e7b386e15a34b356103e573e2a06ca2be4449073180d2ad SHA512 0d1173b27696344bd491f53fe2e6b11e88ba9d5d1b55869c9907ab292c20e248e48fc05b776c573a6f4dd6a49b8cbc247535e59c39990d80633bcbc55ef7c31c EBUILD wine-staging-3.10.ebuild 19971 BLAKE2B 4d18c0f96ce8eb3f4c6fe8871875c323639af7dba6d120a67038b12bfe19d472d36ff1d994be21a6bc89d929561aa97cc1e6629d7b076a63773801e10135a485 SHA512 451f8dff34221638c15a2ad3693c688c2d49f55c2da6b6a45b4577d2c1adfe71a0c005530df377734ad996409bd63b34527c407a74e38f861312191566595ef5 EBUILD wine-staging-3.11.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da -EBUILD wine-staging-3.12.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da -EBUILD wine-staging-9999.ebuild 19882 BLAKE2B 7db7a015866bfdd71263b163c525bdb74307712ac6a32b8b499278cb948f41addf9e122cd2d01553f97eff7f06614679cd0be6ed80ce388b6dc7de942704a66f SHA512 cf53120963fd78fa5c5dcebce9632f5363317cc0761817cea9ace6d2197da8453736b54127026b392c4cb6a69af630ea83fc13d8a981e5a6690ab2b90698c8da -MISC metadata.xml 3506 BLAKE2B 8b2c1e1624503b1ed459b1bab8cbaa488a9cd70734b71ced169eef9a4a70f0912a1849a1442365a9c1567cf1f9bbf431e6e0cf4c6688172f6e0700a5131286d4 SHA512 a79ed8f4c8cc3ac5fd7679a5b2e8db166a9a804d527d9da27455066d790f8cc064726829a27e8cce70c87eac1cc48097ab9391fe918dd39d32ba5e0f69f2b6ba +EBUILD wine-staging-3.12.ebuild 19989 BLAKE2B f0795b778938a606485b6c46689e1581f307031726a1360e934b9697f1a718ff67cab2207cf3c9371615bf0b4c02f0520c002b7c657bc16c1dd54c3280541d04 SHA512 5ff3744b85e543a105c80a498430fbe40aa82472767f942dd852079f4207f08a1cb71f548b6e2f53fcd56f6aa53c89c7b93d2f95e6e49fad7ae690d7edcd990c +EBUILD wine-staging-9999.ebuild 19989 BLAKE2B f0795b778938a606485b6c46689e1581f307031726a1360e934b9697f1a718ff67cab2207cf3c9371615bf0b4c02f0520c002b7c657bc16c1dd54c3280541d04 SHA512 5ff3744b85e543a105c80a498430fbe40aa82472767f942dd852079f4207f08a1cb71f548b6e2f53fcd56f6aa53c89c7b93d2f95e6e49fad7ae690d7edcd990c +MISC metadata.xml 3591 BLAKE2B 748c2fc43338e250665dc5c18cef4aaa96b95b3f4a64768eb4fa97da65ecc3e65713833eb9fdb67f27e102221e621ee6fabc90babf982c97b455a2e9638ecfc1 SHA512 d60cc92fcd7391ffc92a5107b1e294bdb9f1bf6c02bc3495af67dfa9c30f06ee7868802ca7fa8c0e2a79c52edcd088e071d5d12663b3ea83c9112002e01ea524 diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index da4de45bfb76..116d5656a6a4 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -20,6 +20,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="capi">Enable ISDN support via CAPI</flag> <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> + <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag> <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> diff --git a/app-emulation/wine-staging/wine-staging-3.12.ebuild b/app-emulation/wine-staging/wine-staging-3.12.ebuild index 54b66bc499b1..e7da95dd642e 100644 --- a/app-emulation/wine-staging/wine-staging-3.12.ebuild +++ b/app-emulation/wine-staging/wine-staging-3.12.ebuild @@ -44,10 +44,11 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) + ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -70,6 +71,7 @@ COMMON_DEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -436,6 +438,7 @@ multilib_src_configure() { $(use_with cups) $(use_with ncurses curses) $(use_with udisks dbus) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 54b66bc499b1..e7da95dd642e 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -44,10 +44,11 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) + ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) @@ -70,6 +71,7 @@ COMMON_DEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) @@ -436,6 +438,7 @@ multilib_src_configure() { $(use_with cups) $(use_with ncurses curses) $(use_with udisks dbus) + $(use_with ffmpeg) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 4ea03bb9ac56..3b391b795835 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,4 +1,4 @@ -AUX gentoo-patches.conf 4233 BLAKE2B 206bd90a74dd61d83982f5af1fc737e7de4dabb1771eda63465b890e42652b2c6be241e8723e9f96ff50af63564177d22b8d1a2801468943b4c3063b0c51e9a9 SHA512 17ab3716093e8e94e75bd0288b00e143debae10261554713e59d790710c9cdd8618a0935c15ab8c55a3f7795c66afc4cf458d326becf97e203f788e09bb2acf3 +AUX gentoo-patches.conf 4804 BLAKE2B b86868fa13e85231231fe21c9af969f79f3319535875658ec38335fb15dc155ff344c43d6da15d08bb364a12a2a6979f70933a6beaef077b31633cb584b6be31 SHA512 c825b99526edef9f3c73c56f9cd4c918e6570fed106df0e3d7676f2d71d851a7e75dde0b2dee2d3d10d85e27ec097822a48473bbedec79075d887dd7b15cf4d1 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 @@ -18,6 +18,9 @@ DIST ovmf-20170321.tar.xz 22141096 BLAKE2B 79e991c8f9deb297865c319e88b6e6d46b1d0 DIST seabios-1.10.0.tar.gz 588213 BLAKE2B 254eb4572a1dac06020a545820efb53a130a027aaab035cd916009b424475f89bd151f82f1bc5103c01c4657d09da3219d2fbcc7728add473011dcfc7bff7410 SHA512 f1b83ce37b59070b488e19f98c95ca9f413cf4969663331b631c3ccb884c90b2db793d32a779ef05cead538c2fd123be4b73391ad2fa20c900a1f14237178d8c DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00 DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690 +DIST xen-4.10.1-upstream-patches-0.tar.xz 69172 BLAKE2B 6da6f3938b5c20692bf7a7f79c21a1f0ed4fa010c8d99a95a2d3a19923f59aad677a3f23ceedf751921105f682ae2e6deb9539802e03c01be267dfc30d53b17e SHA512 b0086c15f811706a0993b92d253d736041b8d7bc4effd082bf092e0d4d372a8b1580f499d225eb0d1a449e14845885bdd749e3df9609c657de6ff8d389c2eb45 +DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea +DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed DIST xen-4.9.1-upstream-patches-2.tar.xz 84228 BLAKE2B 3b98cdb1202d4c9817dd1919b9dc5d4c06510d3be2c077b2e41334928bca07c65a9d8a421fc2a1ae3b806e69f7b61334f7c54d48952c98192ece4b5826539df8 SHA512 673520bff88fa401e1d1c7accc8d3650d4d74a9e52bc7195cfcb5335226c69ef0230e7db719fd97ce6df2f5198646ae0fbccc6f812d7e9ccd38a6eef359d287c DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274 @@ -25,8 +28,11 @@ DIST xen-4.9.2-upstream-patches-2.tar.xz 16100 BLAKE2B 469b5ab7c5514a4974ba63701 DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93 DIST xen-gentoo-patches-10.tar.xz 27876 BLAKE2B 8efece8548a046b47c04e5b9354ca8bdff55affd6c6bc67315ac7536778fbaa183d346e0ff83e365030df2433bddf845188a1c3fb8feaea2e93d5ba0dd1c779a SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece DIST xen-gentoo-patches-12.tar.xz 28188 BLAKE2B 75f565d52e75d4f68d7a1be88a79e7cefe82350ca1f4852ecdb79137549d73ef1ffb665bac998956a6f180cde6faeb9a11ec1f5442c8ae53c7cbd869318ef315 SHA512 4e1ebbd244670d3a4171fd93eda7eb14deae3e3ad45b3a85c015696ff0a86b69156f24ee428d6c92b7be426938997cec2fab031ecb5b03ad26a38451523882de +DIST xen-gentoo-patches-13.tar.xz 30276 BLAKE2B 4e83011d90e30693e0d08848a8caddac1a4e283d33a257e37be0276cd662d7491d9db71d345a52f62bd57be80e7e707bf4ffa0ba8231702e4fc0765801884c7d SHA512 8211e325667c706fd22d82421aa4d0265c1ed49980911747f97014a24bb7d2e663a14eba1017101fab07a19de3a820c55e4b1cc9c16dbb0c001f33cf82ff26b3 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b EBUILD xen-tools-4.10.0.ebuild 13965 BLAKE2B 18a2ed460d43c66aa133fdbb9f628b46778899a570b6a16000abc2567264b3f9566b2dd1761654d2d7fe7ad88536ee82c6dd83349c32db0e1a94ebcfc07e4af5 SHA512 cc335e72707d171fcd5f197d230bf1ca5995da953371622ed9d3cef791e2e12234f7ceb2a335917547f30828aed6d3ed7b185836b7a2bbf48d3a20fc1436cc43 +EBUILD xen-tools-4.10.1.ebuild 14007 BLAKE2B 0e856f2bff7ddfd87d64af29c0595ca1aedacaf200d967f6e35a24dc3273f7c61f25add5ee224f5f1dfc1cf7645d3d065019d92020875ce499f55c010af9c211 SHA512 11309a357bf43febf298410bc3faf398f0779c00aff2ce34427da0f63e831556da42f3b8fdc79affb680f6a925850bec912f2a4810dd8cbea7c3878d710edaaf +EBUILD xen-tools-4.11.0.ebuild 14054 BLAKE2B 641117a03f843e00134d25412543b320589232efc260244fbff9aaf031110f619a84d798340785205197a40eefa0fe9e67d96c4ab1a297a6709258f7d634d149 SHA512 ca862d0ab0bd4423ed6fb1b78c119dca2a367727698e3ffdaf89ac30758c5eea3046fe0a1cf093a4ee16974b5244153d6713ccf74f24635e46eae1964e7c6419 EBUILD xen-tools-4.9.1-r1.ebuild 13751 BLAKE2B 324842ae54e6b973fcc71671b033e1e9845b30815538a7a8f47c74ca964b07cabdabbb4d8b5a34bd53b71c15fd47dac381700f33b32ecb3e1fbdcd9cfde7019e SHA512 17996a45a45d4af9139e06a72a574b2eee4d843bf8beb790485990559654801db5fc287e1cb25545d94d22803db6848c4c317ed95bd816d1dce19aec0ae62bbb EBUILD xen-tools-4.9.1-r2.ebuild 13853 BLAKE2B ef9227169434140233fa79299ef15463fb15a7aa04d887728394c19238d5914547f5c2fc6342acdb0a5d3764872fbe031912602fa8ebc479ce24f7ecaf25df45 SHA512 9a72c0bbedcc60ee4f145c1b42bf90e2cb79e0262de70d4f4ed7c99c311852d2ced336b85d626afbf0ff43c4f7e28d716ba06d654a428cf320a9be9d779fd10d EBUILD xen-tools-4.9.2-r1.ebuild 13748 BLAKE2B 0847bfa1075f2d4e3d6502914987d52325c35c1c3efe2c87cf0ae4b2a70d3e2f0ab7fd92712f9e8a72406e59b139694b60561509d99648c90030652f407e8297 SHA512 fccb2bf63a6672503237cdef15382387a8d2331b8e040aae0adbf46c0f91d4994839ec4c9288e39072ddd8d33e4a0ef82add13d31dea7a10e600e790eaa22f06 diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index 84b56bc7313c..b22aacefceba 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -15,6 +15,7 @@ _gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch" # Bug 496708 _gx008=" xen-tools-4-unbundle-ipxe.patch" +_gx045=" xen-tools-4.10.1-unbundle-ipxe.patch" #use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch # Fix bridge by idella4, bug #362575 @@ -105,6 +106,13 @@ _gx042=" xen-tools-4.8.2-makedev.patch" # Fix building with glibc 2.27, bug #648182 _gx044=" xen-tools-4.9-glibc-memfd.patch" +# Disable failing shim +_gx046=" xen-tools-4.10.1-shim.patch" + +# Fix building with gcc 8, bug #657388 +_gx047=" xen-tools-4.10.1-gcc8.patch" +_gx048=" xen-tools-4.11.0-gcc8.patch" + # xen-tools-4.8.2 patches set _gpv_xen_tools_482_0=" ${_gx008} @@ -160,3 +168,21 @@ ${_gx028} ${_gx029} ${_gx037} ${_gx042} ${_gx044} " + +# xen-tools-4.10.1 patches set +_gpv_xen_tools_4101_0=" +${_gx038} ${_gx017} ${_gx043} +${_gx027} +${_gx028} ${_gx029} +${_gx037} ${_gx042} +${_gx044} ${_gx045} ${_gx046} ${_gx047} +" + +# xen-tools-4.11.0 patches set +_gpv_xen_tools_4110_0=" +${_gx038} ${_gx017} ${_gx043} +${_gx027} +${_gx028} ${_gx029} +${_gx037} ${_gx042} +${_gx045} ${_gx046} ${_gx048} +" diff --git a/app-emulation/xen-tools/xen-tools-4.10.1.ebuild b/app-emulation/xen-tools/xen-tools-4.10.1.ebuild new file mode 100644 index 000000000000..864242ce664b --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.10.1.ebuild @@ -0,0 +1,457 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 + +MY_PV=${PV/_/-} +MAJOR_V="$(get_version_component_range 1-2)" + +if [[ $PV == *9999 ]]; then + inherit git-r3 + KEYWORDS="" + REPO="xen.git" + EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" + S="${WORKDIR}/${REPO}" +else + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + UPSTREAM_VER=0 + SECURITY_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=13 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 + # xen-tools ovmf's patches + OVMF_VER=3 + + SEABIOS_VER=1.10.0 + # OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05 + OVMF_PV=20170321 + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + [[ -n ${OVMF_VER} ]] && \ + OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" + + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz + http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz + https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz + ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz + ${OVMF_PATCHSET_URI} ) + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" + + S="${WORKDIR}/xen-${MY_PV}" +fi + +DESCRIPTION="Xen tools including QEMU and xl" +HOMEPAGE="https://www.xenproject.org" +DOCS=( README docs/README.xen-bugtool ) + +LICENSE="GPL-2" +SLOT="0/${MAJOR_V}" +# 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 ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + pygrub? ( python ) + ovmf? ( hvm ) + ^^ ( qemu system-qemu )" + +COMMON_DEPEND=" + sys-apps/pciutils + dev-libs/lzo:2 + dev-libs/glib:2 + dev-libs/yajl + dev-libs/libaio + dev-libs/libgcrypt:0 + sys-libs/zlib + ${PYTHON_DEPS} +" + +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-4.11 + dev-python/lxml[${PYTHON_USEDEP}] + x86? ( sys-devel/dev86 + sys-power/iasl ) + pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) + api? ( dev-libs/libxml2 + net-misc/curl ) + ovmf? ( + !arm? ( !arm64? ( dev-lang/nasm ) ) + $(python_gen_impl_dep sqlite) + ) + !amd64? ( >=sys-apps/dtc-1.4.0 ) + amd64? ( sys-devel/bin86 + system-seabios? ( sys-firmware/seabios ) + sys-firmware/ipxe + sys-devel/dev86 + sys-power/iasl ) + dev-lang/perl + app-misc/pax-utils + doc? ( + app-text/ghostscript-gpl + app-text/pandoc + dev-python/markdown[${PYTHON_USEDEP}] + dev-texlive/texlive-latexextra + media-gfx/transfig + ) + hvm? ( x11-base/xorg-proto + !net-libs/libiscsi ) + qemu? ( + app-arch/snappy:= + x11-libs/pixman + sdl? ( media-libs/libsdl[X] ) + ) + system-qemu? ( app-emulation/qemu[xen] ) + ocaml? ( dev-ml/findlib + >=dev-lang/ocaml-4 )" + +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2[-minimal] + net-misc/bridge-utils + screen? ( + app-misc/screen + app-admin/logrotate + )" + +# hvmloader is used to bootstrap a fully virtualized kernel +# Approved by QA team in bug #144032 +QA_WX_LOAD=" + usr/libexec/xen/boot/hvmloader + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +QA_PREBUILT=" + usr/libexec/xen/bin/ivshmem-client + usr/libexec/xen/bin/ivshmem-server + usr/libexec/xen/bin/qemu-img + usr/libexec/xen/bin/qemu-io + usr/libexec/xen/bin/qemu-nbd + usr/libexec/xen/bin/qemu-system-i386 + usr/libexec/xen/bin/virtfs-proxy-helper + usr/libexec/xen/libexec/xen-bridge-helper + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/s390-netboot.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +RESTRICT="test" + +pkg_setup() { + python_setup + export "CONFIG_LOMOUNT=y" + + #bug 522642, disable compile tools/tests + export "CONFIG_TESTS=n" + + 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" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi +} + +src_prepare() { + local i + + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patch set" + eapply "${WORKDIR}"/patches-upstream + fi + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + EPATCH_SUFFIX="patch" + EPATCH_FORCE="yes" + + source "${WORKDIR}"/patches-security/${PV}.conf || die + + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + + # apply qemu-xen/upstream patches + pushd "${S}"/tools/qemu-xen/ > /dev/null + for i in ${XEN_SECURITY_QEMUU}; do + eapply "${WORKDIR}"/patches-security/qemuu/$i + done + popd > /dev/null + + # apply qemu-traditional patches + pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null + for i in ${XEN_SECURITY_QEMUT}; do + eapply "${WORKDIR}"/patches-security/qemut/$i + done + popd > /dev/null + fi + + # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err + mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null + + # Gentoo's patchset + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patch set" + source "${FILESDIR}"/gentoo-patches.conf || die + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + eapply "${WORKDIR}"/patches-gentoo/$i + done + fi + + # Ovmf's patchset + if use ovmf; then + if [[ -n ${OVMF_VER} ]];then + einfo "Try to apply Ovmf patch set" + pushd "${WORKDIR}"/ovmf-*/ > /dev/null + eapply "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi + mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die + fi + + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + + # 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" + + # try and remove all the default 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" + else + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + unset CPPFLAGS + fi + + if ! use pygrub; then + sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die + fi + + if ! use python; then + sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die + fi + + if ! use hvm; then + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die + # Bug 351648 + elif ! use x86 && ! has x86 $(get_all_abis); then + mkdir -p "${WORKDIR}"/extra-headers/gnu || die + touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die + export CPATH="${WORKDIR}"/extra-headers + fi + + if use qemu; then + if use sdl; then + sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ + tools/Makefile || die + else + sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ + tools/qemu-xen-traditional/xen-setup || die + sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ + tools/Makefile || die + fi + else + # Don't bother with qemu, only needed for fully virtualised guests + sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die + fi + + # 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 + + # 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.in || die + + # fix bashishm + sed -e '/Usage/s/\$//g' \ + -i tools/hotplug/Linux/init.d/xendriverdomain.in || 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 + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=:autoballoon=:' \ + -e 's:^#lockfile=:lockfile=:' \ + -e 's:^#vif.default.script=:vif.default.script=:' \ + -i tools/examples/xl.conf || die + + default +} + +src_configure() { + local myconf="--prefix=${PREFIX}/usr \ + --libdir=${PREFIX}/usr/$(get_libdir) \ + --libexecdir=${PREFIX}/usr/libexec \ + --localstatedir=${EPREFIX}/var \ + --disable-werror \ + --disable-xen \ + --enable-tools \ + --enable-docs \ + $(use_enable pam) \ + $(use_enable api xenapi) \ + $(use_enable ovmf) \ + $(use_enable ocaml ocamltools) \ + --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ + " + + 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)" + econf ${myconf} +} + +src_compile() { + local myopt + use debug && myopt="${myopt} debug=y" + + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} + + if use doc; then + emake -C docs build + else + emake -C docs man-pages + fi +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=/tmp/init.d + export CONFIG_LEAF_DIR=../tmp/default + + # Let the build system compile installed Python modules. + local PYTHONDONTWRITEBYTECODE + export PYTHONDONTWRITEBYTECODE + + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ + XEN_PYTHON_NATIVE_INSTALL=y install-tools + + # Created at runtime + rm -rv "${ED%/}/var/run" || die + + # Fix the remaining Python shebangs. + python_fix_shebang "${D}" + + # 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} + dodoc ${DOCS[@]} + + newconfd "${FILESDIR}"/xendomains.confd xendomains + newconfd "${FILESDIR}"/xenstored.confd xenstored + newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled + newinitd "${FILESDIR}"/xencommons.initd xencommons + newconfd "${FILESDIR}"/xencommons.confd xencommons + newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev + newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev + newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die + keepdir /var/log/xen-consoles + 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 + fi + + # for xendomains + keepdir /etc/xen/auto + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ + -o -name openbios-ppc -o -name palcode-clipper \) -delete || die +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "https://wiki.gentoo.org/wiki/Xen" + elog "https://wiki.xen.org/wiki/Main_Page" + elog "" + elog "Recommended to utilise the xencommons script to config sytem At boot" + elog "Add by use of rc-update on completion of the install" + + if ! use hvm; then + echo + elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" + elog "support enable the hvm use flag." + elog "An x86 or amd64 system is required to build HVM support." + fi + + if use qemu; then + elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" + elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" + elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" + elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" + fi +} diff --git a/app-emulation/xen-tools/xen-tools-4.11.0.ebuild b/app-emulation/xen-tools/xen-tools-4.11.0.ebuild new file mode 100644 index 000000000000..c9cc42133fbb --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.11.0.ebuild @@ -0,0 +1,458 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 + +MY_PV=${PV/_/-} +MAJOR_V="$(get_version_component_range 1-2)" + +if [[ $PV == *9999 ]]; then + inherit git-r3 + KEYWORDS="" + REPO="xen.git" + EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" + S="${WORKDIR}/${REPO}" +else + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + UPSTREAM_VER= + SECURITY_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=13 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 + # xen-tools ovmf's patches + OVMF_VER=3 + + SEABIOS_VER=1.10.0 + # OVMF upstream 5920a9d16b1ab887c2858224316a98e961d71b05 + OVMF_PV=20170321 + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + [[ -n ${OVMF_VER} ]] && \ + OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" + + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz + http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz + https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz + ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.xz + ${OVMF_PATCHSET_URI} ) + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" + + S="${WORKDIR}/xen-${MY_PV}" +fi + +DESCRIPTION="Xen tools including QEMU and xl" +HOMEPAGE="https://www.xenproject.org" +DOCS=( README docs/README.xen-bugtool ) + +LICENSE="GPL-2" +SLOT="0/${MAJOR_V}" +# 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 ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + pygrub? ( python ) + ovmf? ( hvm ) + ^^ ( qemu system-qemu )" + +COMMON_DEPEND=" + sys-apps/pciutils + dev-libs/lzo:2 + dev-libs/glib:2 + dev-libs/yajl + dev-libs/libaio + dev-libs/libgcrypt:0 + sys-libs/zlib + ${PYTHON_DEPS} +" + +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-4.11 + dev-python/lxml[${PYTHON_USEDEP}] + x86? ( sys-devel/dev86 + sys-power/iasl ) + pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) + api? ( dev-libs/libxml2 + net-misc/curl ) + ovmf? ( + !arm? ( !arm64? ( dev-lang/nasm ) ) + $(python_gen_impl_dep sqlite) + ) + !amd64? ( >=sys-apps/dtc-1.4.0 ) + amd64? ( sys-devel/bin86 + system-seabios? ( sys-firmware/seabios ) + sys-firmware/ipxe + sys-devel/dev86 + sys-power/iasl ) + dev-lang/perl + app-misc/pax-utils + doc? ( + app-text/ghostscript-gpl + app-text/pandoc + dev-python/markdown[${PYTHON_USEDEP}] + dev-texlive/texlive-latexextra + media-gfx/transfig + ) + hvm? ( x11-base/xorg-proto ) + qemu? ( + app-arch/snappy:= + x11-libs/pixman + sdl? ( media-libs/libsdl[X] ) + ) + system-qemu? ( app-emulation/qemu[xen] ) + ocaml? ( dev-ml/findlib + >=dev-lang/ocaml-4 )" + +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2[-minimal] + net-misc/bridge-utils + screen? ( + app-misc/screen + app-admin/logrotate + )" + +# hvmloader is used to bootstrap a fully virtualized kernel +# Approved by QA team in bug #144032 +QA_WX_LOAD=" + usr/libexec/xen/boot/hvmloader + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +QA_PREBUILT=" + usr/libexec/xen/bin/ivshmem-client + 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 + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/s390-netboot.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +RESTRICT="test" + +pkg_setup() { + python_setup + export "CONFIG_LOMOUNT=y" + + #bug 522642, disable compile tools/tests + export "CONFIG_TESTS=n" + + 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" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi +} + +src_prepare() { + local i + + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patch set" + eapply "${WORKDIR}"/patches-upstream + fi + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + EPATCH_SUFFIX="patch" + EPATCH_FORCE="yes" + + source "${WORKDIR}"/patches-security/${PV}.conf || die + + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + + # apply qemu-xen/upstream patches + pushd "${S}"/tools/qemu-xen/ > /dev/null + for i in ${XEN_SECURITY_QEMUU}; do + eapply "${WORKDIR}"/patches-security/qemuu/$i + done + popd > /dev/null + + # apply qemu-traditional patches + pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null + for i in ${XEN_SECURITY_QEMUT}; do + eapply "${WORKDIR}"/patches-security/qemut/$i + done + popd > /dev/null + fi + + # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err + mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null + + # Gentoo's patchset + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patch set" + source "${FILESDIR}"/gentoo-patches.conf || die + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + eapply "${WORKDIR}"/patches-gentoo/$i + done + fi + + # Ovmf's patchset + if use ovmf; then + if [[ -n ${OVMF_VER} ]];then + einfo "Try to apply Ovmf patch set" + pushd "${WORKDIR}"/ovmf-*/ > /dev/null + eapply "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi + mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die + fi + + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + + # 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" + + # try and remove all the default 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" + else + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + unset CPPFLAGS + fi + + if ! use pygrub; then + sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die + fi + + if ! use python; then + sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die + fi + + if ! use hvm; then + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die + # Bug 351648 + elif ! use x86 && ! has x86 $(get_all_abis); then + mkdir -p "${WORKDIR}"/extra-headers/gnu || die + touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die + export CPATH="${WORKDIR}"/extra-headers + fi + + if use qemu; then + if use sdl; then + sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ + tools/Makefile || die + else + sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ + tools/qemu-xen-traditional/xen-setup || die + sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ + tools/Makefile || die + fi + else + # Don't bother with qemu, only needed for fully virtualised guests + sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die + fi + + # 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 + + # 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.in || die + + # fix bashishm + sed -e '/Usage/s/\$//g' \ + -i tools/hotplug/Linux/init.d/xendriverdomain.in || 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 + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=:autoballoon=:' \ + -e 's:^#lockfile=:lockfile=:' \ + -e 's:^#vif.default.script=:vif.default.script=:' \ + -i tools/examples/xl.conf || die + + default +} + +src_configure() { + local myconf="--prefix=${PREFIX}/usr \ + --libdir=${PREFIX}/usr/$(get_libdir) \ + --libexecdir=${PREFIX}/usr/libexec \ + --localstatedir=${EPREFIX}/var \ + --disable-werror \ + --disable-xen \ + --enable-tools \ + --enable-docs \ + $(use_enable pam) \ + $(use_enable api xenapi) \ + $(use_enable ovmf) \ + $(use_enable ocaml ocamltools) \ + --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ + " + + 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)" + econf ${myconf} +} + +src_compile() { + local myopt + use debug && myopt="${myopt} debug=y" + + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} + + if use doc; then + emake -C docs build + else + emake -C docs man-pages + fi +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=/tmp/init.d + export CONFIG_LEAF_DIR=../tmp/default + + # Let the build system compile installed Python modules. + local PYTHONDONTWRITEBYTECODE + export PYTHONDONTWRITEBYTECODE + + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ + XEN_PYTHON_NATIVE_INSTALL=y install-tools + + # Created at runtime + rm -rv "${ED%/}/var/run" || die + + # Fix the remaining Python shebangs. + python_fix_shebang "${D}" + + # 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} + dodoc ${DOCS[@]} + + newconfd "${FILESDIR}"/xendomains.confd xendomains + newconfd "${FILESDIR}"/xenstored.confd xenstored + newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled + newinitd "${FILESDIR}"/xencommons.initd xencommons + newconfd "${FILESDIR}"/xencommons.confd xencommons + newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev + newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev + newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die + keepdir /var/log/xen-consoles + 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 + fi + + # for xendomains + keepdir /etc/xen/auto + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ + -o -name openbios-ppc -o -name palcode-clipper \) -delete || die +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "https://wiki.gentoo.org/wiki/Xen" + elog "https://wiki.xen.org/wiki/Main_Page" + elog "" + elog "Recommended to utilise the xencommons script to config sytem At boot" + elog "Add by use of rc-update on completion of the install" + + if ! use hvm; then + echo + elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" + elog "support enable the hvm use flag." + elog "An x86 or amd64 system is required to build HVM support." + fi + + if use qemu; then + elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" + elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" + elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" + elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" + fi +} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index a3a7f2edc668..c029a31335eb 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,12 +1,17 @@ AUX xen-4.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689 DIST xen-4.10.0-upstream-patches-0.tar.xz 70884 BLAKE2B 9a27e7989486ba3ba59548de356384527cc5b78e63b6ed042506e6534e488272369f021cd2daa516820313c3fe18625a5864794ae0806e7018b8ad28b0a294b1 SHA512 e64bf1d30d24e922c60c3b518a4de7874b43cc695134b4cdd65f6d95ae9ae579c521fab13ca82409fde55e43815d072c3194997e2bda106204cbf329e93a0a00 DIST xen-4.10.0.tar.gz 24618123 BLAKE2B 009faa980f9734525c137d525e626bfa3443c285aeb6b4af91bb2c32a2e98376ded0b1114b541d11e2d4353f4f588d58e8add5b1e0d7de2fe3399d4687c5bfae SHA512 5a37935c382f9cfe3641a35c3be0ba11689bca10c7d3c2401963513e3a834ee8d0c8a0ddcf3716dbf0a795aea1bab78caf19acf1272e5e054bf012cfa06a4690 +DIST xen-4.10.1-upstream-patches-0.tar.xz 69172 BLAKE2B 6da6f3938b5c20692bf7a7f79c21a1f0ed4fa010c8d99a95a2d3a19923f59aad677a3f23ceedf751921105f682ae2e6deb9539802e03c01be267dfc30d53b17e SHA512 b0086c15f811706a0993b92d253d736041b8d7bc4effd082bf092e0d4d372a8b1580f499d225eb0d1a449e14845885bdd749e3df9609c657de6ff8d389c2eb45 +DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea +DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a DIST xen-4.9.1-upstream-patches-1.tar.xz 24592 BLAKE2B 774c5219d6c14d729358e790d880a1a31fb4cda741e54e71879bff164e79bafbd8492eb8bccb7becdf7a2f9605e71266bb4fc15848deff8f9028ed7f8844f915 SHA512 edbc7cad2f6f8a5c7e8aac8efd5454428aa25e0e13018438f78c7f401cfb9173345267e16c7a5dfa78066a952980b172976409a0c63162094b7f507058e712ed DIST xen-4.9.1-upstream-patches-2.tar.xz 84228 BLAKE2B 3b98cdb1202d4c9817dd1919b9dc5d4c06510d3be2c077b2e41334928bca07c65a9d8a421fc2a1ae3b806e69f7b61334f7c54d48952c98192ece4b5826539df8 SHA512 673520bff88fa401e1d1c7accc8d3650d4d74a9e52bc7195cfcb5335226c69ef0230e7db719fd97ce6df2f5198646ae0fbccc6f812d7e9ccd38a6eef359d287c DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d SHA512 9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274 DIST xen-4.9.2-upstream-patches-1.tar.xz 13812 BLAKE2B fe8bf636dea9fbd21c9fc432817dc8e21ffb78bf70279b86babb6963a0dbebc17493eb6c016ee1093ef36e66693df25e8aeb35a568260f2e62a97a787b3c70bb SHA512 d75ea99531a10279736f89057857c257955800df6fe42bd742babfd5a9e527a2cb0d4dc5505b41df5b9db82246a8414f14b7084997ee798ffab657a3991b17ae DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93 EBUILD xen-4.10.0.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911 +EBUILD xen-4.10.1.ebuild 4819 BLAKE2B 3485abb76d742a02a1f5bab5a751c151fa2ac1e82f07fc98a288be9389f6ba4a5a1e56fc9a88ed41bc6e690b9e74ef301732dd57c3d2f25a8bb3e1fb4cdf4021 SHA512 932483e5bef935091d911cf162b40ff69992217847aa5dce3dfe82deda6e924624cf3d7f808b74fd0ea487a7cf25ee50c095e290d76aaaa259c9d57949534911 +EBUILD xen-4.11.0.ebuild 4818 BLAKE2B b0d03f3bf93af3e78c7a9e715e23ef73c2a6c9ac9f71b844d19f9bb97ebdabf47571a6702e192f9879d0e43b2d5c5f3f2a0f431378e881188ca6b9b14ff08527 SHA512 0306d2111c542139f3d715fdfddad59d24e88b22af0389a1a44641d92755e99c525e3d018c40d1098913e33d598e3d60411cca3446fe027779c691d512781581 EBUILD xen-4.9.1-r1.ebuild 4719 BLAKE2B bd5c63e4ed7046568f8276c0a5b65c1cee97e07e0410eec66324b7625619ed6320282181c9b10519f683c54cf22fd0af1e7bce14d5558966535b2393e6136af6 SHA512 3758dd6eb2323e30e9e77efbc46917bb16fed2f8380967903582d0c834d61fde1caa7902d96e5846af6ea4f0b914d64aaac2a58ad75c695e8a7c389e33f4971d EBUILD xen-4.9.1-r2.ebuild 4715 BLAKE2B 27f11164249a0b834e309a2a452db41f102e360a418c79419586b68d8555eedcf375052223ccfd9a3d138bad023c6a3bff4b051da4d677e7f9bf5f5c27dfba00 SHA512 3e7bd5b5805a8419d1ff83bafb33949eb65af2a3eee305a61cedf4686ec44b1fef293c62988caa18dc2e73f7ccca88c4370ece7559456dedb3ed4837d0ec2d98 EBUILD xen-4.9.2.ebuild 4719 BLAKE2B bd5c63e4ed7046568f8276c0a5b65c1cee97e07e0410eec66324b7625619ed6320282181c9b10519f683c54cf22fd0af1e7bce14d5558966535b2393e6136af6 SHA512 3758dd6eb2323e30e9e77efbc46917bb16fed2f8380967903582d0c834d61fde1caa7902d96e5846af6ea4f0b914d64aaac2a58ad75c695e8a7c389e33f4971d diff --git a/app-emulation/xen/xen-4.10.1.ebuild b/app-emulation/xen/xen-4.10.1.ebuild new file mode 100644 index 000000000000..8027e789237b --- /dev/null +++ b/app-emulation/xen/xen-4.10.1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ $PV == *9999 ]]; then + inherit git-r3 + KEYWORDS="" + EGIT_REPO_URI="git://xenbits.xen.org/xen.git" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm -x86" + UPSTREAM_VER=0 + SECURITY_VER= + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" +fi + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="custom-cflags debug efi flask" + +DEPEND="${PYTHON_DEPS} + efi? ( >=sys-devel/binutils-2.22[multitarget] ) + !efi? ( >=sys-devel/binutils-2.22 )" +RDEPEND="" +PDEPEND="~app-emulation/xen-tools-${PV}" + +# no tests are available for the hypervisor +# prevent the silliness of /usr/lib/debug/usr/lib/debug files +# prevent stripping of the debug info from the /usr/lib/debug/xen-syms +RESTRICT="test splitdebug strip" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE="arm? ( debug )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + python-any-r1_pkg_setup + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use amd64; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi + + if use flask ; then + export "XSM_ENABLE=y" + export "FLASK_ENABLE=y" + fi +} + +src_prepare() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + source "${WORKDIR}"/patches-security/${PV}.conf + + local i + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + fi + + # Gentoo's patchset + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + + eapply "${FILESDIR}"/${PN}-4.6-efi.patch + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + if use efi; then + 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 + + default +} + +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 + unset LDFLAGS + unset ASFLAGS + 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 + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" +} + +pkg_postinst() { + elog "Official Xen Guide:" + elog " https://wiki.gentoo.org/wiki/Xen" + + use efi && einfo "The efi executable is installed in boot/efi/gentoo" + + elog "You can optionally block the installation of /boot/xen-syms by an entry" + elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" + elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" +} diff --git a/app-emulation/xen/xen-4.11.0.ebuild b/app-emulation/xen/xen-4.11.0.ebuild new file mode 100644 index 000000000000..f5b10b55f92b --- /dev/null +++ b/app-emulation/xen/xen-4.11.0.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ $PV == *9999 ]]; then + inherit git-r3 + KEYWORDS="" + EGIT_REPO_URI="git://xenbits.xen.org/xen.git" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm -x86" + UPSTREAM_VER= + SECURITY_VER= + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" +fi + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="custom-cflags debug efi flask" + +DEPEND="${PYTHON_DEPS} + efi? ( >=sys-devel/binutils-2.22[multitarget] ) + !efi? ( >=sys-devel/binutils-2.22 )" +RDEPEND="" +PDEPEND="~app-emulation/xen-tools-${PV}" + +# no tests are available for the hypervisor +# prevent the silliness of /usr/lib/debug/usr/lib/debug files +# prevent stripping of the debug info from the /usr/lib/debug/xen-syms +RESTRICT="test splitdebug strip" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE="arm? ( debug )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + python-any-r1_pkg_setup + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use amd64; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi + + if use flask ; then + export "XSM_ENABLE=y" + export "FLASK_ENABLE=y" + fi +} + +src_prepare() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + source "${WORKDIR}"/patches-security/${PV}.conf + + local i + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + fi + + # Gentoo's patchset + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + + eapply "${FILESDIR}"/${PN}-4.6-efi.patch + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + if use efi; then + 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 + + default +} + +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 + unset LDFLAGS + unset ASFLAGS + 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 + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" +} + +pkg_postinst() { + elog "Official Xen Guide:" + elog " https://wiki.gentoo.org/wiki/Xen" + + use efi && einfo "The efi executable is installed in boot/efi/gentoo" + + elog "You can optionally block the installation of /boot/xen-syms by an entry" + elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" + elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" +} |