summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/Manifest.gzbin20021 -> 20005 bytes
-rw-r--r--app-emulation/containerd/Manifest4
-rw-r--r--app-emulation/containerd/containerd-1.1.2.ebuild4
-rw-r--r--app-emulation/containerd/containerd-1.1.4.ebuild55
-rw-r--r--app-emulation/diskimage-builder/Manifest4
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild37
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild4
-rw-r--r--app-emulation/docker-compose/Manifest4
-rw-r--r--app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild72
-rw-r--r--app-emulation/docker-compose/docker-compose-1.22.0.ebuild78
-rw-r--r--app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch58
-rw-r--r--app-emulation/img/Manifest2
-rw-r--r--app-emulation/img/img-0.5.1.ebuild32
-rw-r--r--app-emulation/libvirt/Manifest2
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild6
-rw-r--r--app-emulation/qemu/Manifest2
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild2
-rw-r--r--app-emulation/reg/Manifest2
-rw-r--r--app-emulation/reg/reg-0.15.7.ebuild48
-rw-r--r--app-emulation/vagrant/Manifest2
-rw-r--r--app-emulation/vagrant/vagrant-2.1.5.ebuild82
21 files changed, 449 insertions, 51 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 840dfbb3d7f4..83c898f137c4 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index f0f8ac1fbc75..16e8b644e5a9 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,8 +2,10 @@ AUX containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch 1494 BLAKE2
DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
DIST containerd-1.1.1.tar.gz 5123253 BLAKE2B e3e14311f4b444531b9b5d22ad7babd3fe9e7f4bf540c98153ebfc7445c34dad9c1268863e90a383bdab8630fc6576d1425e3e6a7f37e25fe6fb392aac389e2f SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd
DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
+DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
EBUILD containerd-1.1.1.ebuild 1296 BLAKE2B 19ac8685f774a4ccafbe0433a11b15a2b31c270af9b199a6f543789f93403f1715ac021d24f68e2a7278fab25065900ba02c3efca92e18aa44589d54667d6571 SHA512 f37c5cacabd3f6713af25a9343cb532ba6f73ec842d5d7cbe600bed510a4e11e3c7b27541666af6542dda2be658129c144929c4d2e7a0d8824e308983b4a0a66
-EBUILD containerd-1.1.2.ebuild 1450 BLAKE2B cd09bd651e7ff92ae9db2a83ccbc32fb401cd3cd1d7869d729a263f4a162d2e701c2b62cdd894c09ebaf9fc94716b2c62752b24b992a1ee010c758b0a1907982 SHA512 196636044d6cae76088edf43e49c321f0dc1752f0298f0e5763e0c36e9595ce9d975bef5e0bb883b917d67f820fe9e6e9e58bad964be5e0ef7b3dd11c6495c55
+EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3
+EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b840104c573373cfd7d964f0c6f8876771930225c2fb58ecd17e98854cb050ce91eef66e83201d0d6522b4250d21bb SHA512 be79eade0670b9701670953c552d4452e583284acf3f721d22992ada3f2e55745fa85cab1ea102b5d68d709320f1f44207b43c5ba473ef8e2951ea0ac07c802a
EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.1.2.ebuild b/app-emulation/containerd/containerd-1.1.2.ebuild
index 1e3061539942..b37434d56613 100644
--- a/app-emulation/containerd/containerd-1.1.2.ebuild
+++ b/app-emulation/containerd/containerd-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/containerd/containerd-1.1.4.ebuild b/app-emulation/containerd/containerd-1.1.4.ebuild
new file mode 100644
index 000000000000..0d07ff805fcc
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
+ SRC_URI="https://${EGO_PN}/archive/${EGIT_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="apparmor +btrfs +cri hardened +seccomp"
+
+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 )
+ seccomp? ( 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") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+ export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+ LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+ dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 3c1965641a18..daf7cf2b9f99 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,7 +1,5 @@
-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
DIST diskimage-builder-2.17.0.tar.gz 362965 BLAKE2B 27668c38e480aa14354a7efcb7f3f64b9cfe9f7a61507d2e08809a757aba95f3d51754b35985089c39bc3bca1204e9e2325e19e0d4f77996e22b479e6d804ae2 SHA512 02505823ba48da235127f9bd686bbad3dec32feb2252e5c5b69723a53f6d0926a384c6be5a4055bebf9e0ded82cd9945dab6f26fa7db280722f45d27fef25bc9
-EBUILD diskimage-builder-2.15.1.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60
EBUILD diskimage-builder-2.16.0.ebuild 1136 BLAKE2B f83045e466b1684160ded8c1f473ca9f505a1a29deafa1ed6991bd4037361ce7f5b9a4c8f9973d457e487d657907b4e49235c018342f51b27b95839be0ad7b80 SHA512 b0e481a9d23db7fd0fced29e514106e6fe0367e0ebcdba22322908bd80eb5d8d17cd6c27925eaae3586fa25fd7a344053ce27da8d64adb3539563fcaead2ef60
-EBUILD diskimage-builder-2.17.0.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0
+EBUILD diskimage-builder-2.17.0.ebuild 1133 BLAKE2B 5b75b35be656e3276e28a69fbd761fb9e2762df181662de835013f9b0b6f681f8e83b2a60b74b2940ea731b7c97f78fb67def6f7ca918f7c0de82a4fb73267c3 SHA512 1b4af19d24054146b0d157e9cadb441b1ea3d7b2b9e4e721fddfefad13f647029f8f077ac9bad66712714eb5ed98bb515107bfc21024cafd2b75e93635fc4cd2
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild
deleted file mode 100644
index 8cf50cda77f1..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.15.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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/diskimage-builder/diskimage-builder-2.17.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild
index 1495264437fd..d47518157313 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index e35ec6e24501..fc88fe598ea1 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,9 @@
+AUX docker-compose-1.22.0-setup-py.patch 1763 BLAKE2B bb4c9cf7213b6f74115a61aa625dc8eb15435d958d5fd6704ca6f71bed2c3cb56f4d63b2c7a67bc6d78ede19f7656b9c56e04bd65c2e34ce03027d080f7c3b9e SHA512 dde4ce13526bbb6399c4ba251fe609eed53975e83b54c167d3a18e76bd612a33a59005bfc032d753c36eb433c78eabb6031c8013a93d8cd8735132e4de1bcb68
DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
+DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979 SHA512 eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a29b2e26bd8309c2f5e10d4e1c119aba85e92a63dfd3340183509046822d28e70c45e0e2d7f284fd4e9d12ba89847f7284a SHA512 5e993e855076b450709e1c30958b2cb7710624b880e6b0d86d38c5de14a216cf9960f883c6c1ccab7c892d503b2ee9fac58a1c17e754e4ee55e167f8efb76771
EBUILD docker-compose-1.21.2-r1.ebuild 2425 BLAKE2B f843c549ec46b148b41640834e838f979fa6f3233ff0da9452bd1ff496802cbc42bd90fdb20dbf8a335505616e0f9fdd7358d34a056d3bfaf96caa1ac879dfb1 SHA512 6b252def3e8afc17d0e9d5a86a7afe118f58f3f207bcf194f2ecf1d91c00495f38b10808a2b538034f8be95944d8904894fdbe1976425ddeba6b26fe97c207ba
+EBUILD docker-compose-1.22.0-r1.ebuild 2239 BLAKE2B fb97dda41ee3054ff833db3cf44ed5ae59b89a5868e94d3648c9e960c2c0f912a2efa885ec7a002b50a7872df574a24c76feaa9057fb053e8c4e5c6a6e534650 SHA512 fb3e0dd948b90a94d86cbab84a69aae411ba28f7f716edca10ae3d798a38a4803b27e73e46899e02cdbf33b54745754dc9e091c6a5a3b6f4c3920409a6314454
+EBUILD docker-compose-1.22.0.ebuild 2663 BLAKE2B 9a248b369b945b8153cdf21d8eb4a1980dfed4e9575a688a5313436d21494efe5d03dc619cff66b5ca768d7177d6ce3f83dba349f80488c1685321111a35e90a SHA512 b295eb70ebe8f5f315426763baf7156866fbff61a23fbf22b0a9428f5020e9b0bf902596d74d6704489803c6e03b67e631fb0ad07bc03963fb04f9cc90ff1dfc
MISC metadata.xml 244 BLAKE2B 53209cee097c735489cfd00cf11508c9c89872fa32e72c97913a05a07221167a2369f1e631c7d345ecebce3d8848382cc1fa72c9e06b014fa8684e8a7078e33a SHA512 20242e3498fac7637e5edd6a175e303579f6a20e250e0f0ae420a8dc38ba7caf3659407acd1ea9eee79d5d28aacab8def3bacc4f8f0c984916a21392b26c9dc9
diff --git a/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..a9900fc1c66c
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.22.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+ !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+ )
+"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-setup-py.patch
+)
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/docker-compose-1.22.0.ebuild b/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
new file mode 100644
index 000000000000..762d474a0435
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.22.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/cached-property-2[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ <dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-3.4.1[${PYTHON_USEDEP}]
+ <dev-python/docker-py-3.5[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ <dev-python/docopt-0.7[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+ !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+ <dev-python/PySocks-2[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ <dev-python/pyyaml-4[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+ <dev-python/requests-2.19[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/six-2[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+ <dev-python/texttable-0.10[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+ <dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+ )
+"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ eapply_user
+}
+
+python_test() {
+ ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
new file mode 100644
index 000000000000..191e96d63961
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.22.0-setup-py.patch
@@ -0,0 +1,58 @@
+From 950506efebe97cb76f6cd3a558bab724452a51e9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 24 Sep 2018 17:35:22 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 24 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e0a26b0..1f9fb7f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,16 +30,16 @@ def find_version(*file_paths):
+
+
+ install_requires = [
+- 'cached-property >= 1.2.0, < 2',
+- 'docopt >= 0.6.1, < 0.7',
+- 'PyYAML >= 3.10, < 4',
+- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
+- 'texttable >= 0.9.0, < 0.10',
+- 'websocket-client >= 0.32.0, < 1.0',
+- 'docker >= 3.4.1, < 4.0',
+- 'dockerpty >= 0.4.1, < 0.5',
+- 'six >= 1.3.0, < 2',
+- 'jsonschema >= 2.5.1, < 3',
++ 'cached-property >= 1.2.0',
++ 'docopt >= 0.6.1',
++ 'PyYAML >= 3.10',
++ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++ 'texttable >= 0.9.0',
++ 'websocket-client >= 0.32.0',
++ 'docker >= 3.4.1',
++ 'dockerpty >= 0.4.1',
++ 'six >= 1.3.0',
++ 'jsonschema >= 2.5.1',
+ ]
+
+
+@@ -52,11 +52,11 @@ if sys.version_info[:2] < (3, 4):
+ tests_require.append('mock >= 1.0.1')
+
+ extras_require = {
+- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
++ ':python_version < "3.4"': ['enum34 >= 1.0.4'],
+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+ ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
+- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ ':sys_platform == "win32"': ['colorama >= 0.3.9'],
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ }
+
+
+--
+2.19.0.rc2
+
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index b0041d15dbc5..1f8b00a046be 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,5 +1,7 @@
DIST img-0.4.8.tar.gz 5587652 BLAKE2B 5b74ff24e6f36674b66b3f87abe928a9d8c8361835eb61cb04ddfce6bfc7cb7b8e6e1f41d61d9f75c09c3646d0d697074882e1f7b87259b60d7c53303718e325 SHA512 fb5b97c4794798dc2dba5d4c9493da9708a55a9e5e7b2259585409c4e7973fecd362132dabb81c72f20b61956c5a8bc67b58db49c22e7ce56eaec784bbb51ca5
DIST img-0.4.9.tar.gz 4654821 BLAKE2B b3cd419aeb64ec8c2e8ee0fd523d387fd5b1a340ad61deec1e3fda59ba4e58e7594682aa49e04922e5bdcad4c458f23d4b8081784ba9d7d88dc953a0bd7c24a9 SHA512 c529affce023a8ae972a8526b48701d137edd3a8d5a22687269eec07864a1c30edf1c84bfea29cb7d166cc4fed4b0eb1e34e41d5d21be9d1a3b975b4c1bc678f
+DIST img-0.5.1.tar.gz 6394095 BLAKE2B 5c26487f721ef7157c8dc47c5abc2f4f296efe4ddf3b4e1e0513e4a2a71c96287e92c2332b340d583f0687ff7c3b1f10aea107f9ab1527b3f6760f1f359de867 SHA512 66f812da0b77882a610f4de849eaf473a0a6e964fff7cc0b596b46411aa33d625a376d3e829b8eb438e26d09624146c18b83a2289ddf2785024e3f8a6fee6cf9
EBUILD img-0.4.8.ebuild 921 BLAKE2B 050b449fa9c34e4171573810ccb204ae2eba7e0ad9a50da5e3c0673f0b9c74b81e611d9a6e07506b560e4570fc2ee5ffc7455d95ba071ab6e23aef9abdf413cf SHA512 9871ad935ed3382eddc90a3955ce68462a6e34a0f8c4299fec30ff0791924c7bd6ab75e02767afd36a2283aa705636d7c28683fea53b1ecc19352319ac0792a1
EBUILD img-0.4.9.ebuild 921 BLAKE2B 43a0c49430a0b1c4696cbe41353fa53a2d2bbe6f0de7602d2338c48a1a86335c1cfdb548b569829bcb51591adc626c9088937cb7121d61a2de79ed775d9c48ca SHA512 14ece586610cc8b76a42b39c79b2f41bd36d8f80d10398ae3f147fda6d512276eb5bc8aba6700c122f34b28426be6dabee2048a634f29b62657b287fdc145c92
+EBUILD img-0.5.1.ebuild 918 BLAKE2B e79cd947781d1779f954a07a414bf5412fb84ae273a196aa21f12b26aa029d083f029657c6e2adb21d80267181f31ec84ef5b861526c338a260ed1c556a55013 SHA512 e93d152e84429e3044c760264e61fc8210f0f7f45c9322ede18266f88fb4f9539631aa1999ef9e3a73afae90819b769939a802c772c3d1233187d87edc821ee8
MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
diff --git a/app-emulation/img/img-0.5.1.ebuild b/app-emulation/img/img-0.5.1.ebuild
new file mode 100644
index 000000000000..c730376b7f9d
--- /dev/null
+++ b/app-emulation/img/img-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/img"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="671aaaa647a51cfd35f911e620fdd82d875403f5"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+RESTRICT="test"
+
+src_compile() {
+ local TAGS=$(usex seccomp 'seccomp' '')
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc -r src/${EGO_PN}/README.md
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f2747bd1f43c..0bf55456249f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -22,5 +22,5 @@ EBUILD libvirt-4.3.0.ebuild 9699 BLAKE2B 7f0390663ecd2035c475988ec31fc366d61cba3
EBUILD libvirt-4.4.0-r1.ebuild 9588 BLAKE2B 254646cc46c499ec97e9c8cbe30791aa8dbaa58e6a47335a4199108c7270905ba1b0bb5a3101f0f979f41dcea6415e9b2b0594283eed9509cc01ab623bcc51ff SHA512 07e299cff3761a985bb7fa45aae0feda3b8ae2e941676a7dac24261ca55f2030208558c0937342b94fee3c52258446e68ef942a468630eabca85fca1f16f369c
EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
EBUILD libvirt-4.6.0-r1.ebuild 9594 BLAKE2B 8debc08e38b109ba5bb557d578b873528e615ef13963d88c0571d54d4e6c3f014b6849b930480b76e365d0a94ee1bd04bc19732dd086b21b199524306139c938 SHA512 11ed66a25dd362f329259c8cd6de6b1c268cb401a082934ca31a38476d024e21a368587c0dff9738901ef6a6f87a3aa38419fc5d2e2c70d2804966a628c98617
-EBUILD libvirt-9999.ebuild 9609 BLAKE2B f0da3d38a293601e6a55343098d69c00d568002c083c794ce4e87aed417970a0c8a5109b3ccc87cbc230e470bdd199f789a14491cd497cb91422e03994ffe1f2 SHA512 fe3e5de78dfc02aa08cdcd0b0807069cd45b1302f373a6ce5559229e23370c83372312334e8a7de810c804af4f8b4eb98d0f5bcd6a37a9eae65436b8403720d3
+EBUILD libvirt-9999.ebuild 9592 BLAKE2B 5817e1b555bb4fb1b7693b3fb37be86b9c7880b27f10a0d2a4d29007f624a93683e29ea570a8b050000ede2816d461470e74ca8b0c0485f4592ca68f3961a645 SHA512 32942537280ea5eba374db5384d8a62bf3ce5b36ab0acb76b3741bb24c60a29d7e2cff0f40dc56c0ce769c6b68a74dae5e9ca0fb3cb4c5e2cef2ea908baeb940
MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index e6f5276a786e..81dd4e44b933 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -91,7 +91,7 @@ RDEPEND="
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
- dev-libs/jansson
+ dev-libs/yajl
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
@@ -107,7 +107,7 @@ RDEPEND="
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
- app-emulation/xen-tools:=[api,hvm]
+ app-emulation/xen-tools
)
udev? (
virtual/udev
@@ -266,7 +266,7 @@ src_configure() {
$(use_with phyp)
$(use_with policykit polkit)
$(use_with qemu)
- $(use_with qemu jansson)
+ $(use_with qemu yajl)
$(use_with rbd storage-rbd)
$(use_with sasl)
$(use_with selinux)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 00cbba14ae24..c6fd9877fdfd 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -13,5 +13,5 @@ DIST qemu-3.0.0.tar.bz2 41491935 BLAKE2B 715ccca4fced730425eb5c24a78d89d2ab59f64
EBUILD qemu-2.12.0-r3.ebuild 24051 BLAKE2B 8bacbd42b4abc2015d2a250bc1954867e329a7d4513bf8dc7c82c508563419e91e4a12d3ca74f3735073ea5cc0c9d15870feb40d497ef991df990426f4a65a3a SHA512 9a6efb5b677b8c0f0586b39e9abc6ddd69ff9bca8ee390269f9bf493c466791009def6caf1d9477cda251626ed1f8518cc7a8851d0c066586527d711269c1bfb
EBUILD qemu-2.12.1.ebuild 24051 BLAKE2B 7587b86e783ba772c5895696398e8b808864f0b98159f2d55715d71bf3b6fb30ebf6b9abbe6f02c0d29546f39a40208aae181f8a9bc44e94d3ffb025d2fcb30a SHA512 e6e231ab225b62bdb1da182291a8d47fc57975d0b4a7732eb71809db4903fabd33f4d645fbf421502454438da48734b03b90484655e47f034fb91415ba05358c
EBUILD qemu-3.0.0.ebuild 24055 BLAKE2B d4d86c9df7aad7efa6118db37143e215a380b41457cfae23d1bb4e6f46dfb40c503a740192870f2c483a8ae7d715698ba26c0e2c8768e1b75fd38f381a7c880f SHA512 750b05b4870c334d96abe8be1f9a309eed48862ffa1da1c8e4f046395c0c9c42d7830287d82a7432c8ee9d8446704cc37a130c72ca5d462f46779f854cdfd942
-EBUILD qemu-9999.ebuild 23923 BLAKE2B 469b13bfc75e9a60346cc3970e1cce0eb3810fe4dc89f5c426d2a7202965c44cb1c9009c2b9a0cef52d44e75fdc27b59bc7a8dc1c31fe16c71249dd113b939b7 SHA512 b9879909e51e825d75ac3ab3491395986899b7a36f256a1f8bb2016d3c8efb0b58a6f5b97b51dcbf652ca2926561a691b72102b4c8fc13b3383f7d13b6f20f10
+EBUILD qemu-9999.ebuild 23916 BLAKE2B 6c7d76d45f3d3c639e675063e6440adae1dc3dcc61c01d69f426791520b31881303ad453568fd5c0fb23ef9f328df379620dab7f36fe814c7f5ef654dcbb8284 SHA512 39a0dd61ed61346f8cec5485a1fbfc9904e8fadce27cd33b87698820f1473660f5e1ae9fbb664c69d0db1fe8486bb6153d0315da79a6a5e9c7d9599b118235d0
MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8f95e3f2a6e6..833c2349a4c9 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -38,7 +38,7 @@ COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
- lm32 moxie ppcemb tricore unicore32"
+ lm32 moxie tricore unicore32"
IUSE_USER_TARGETS="${COMMON_TARGETS}
aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
tilegx"
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index fa93b22b5622..aed6a92b1602 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -4,9 +4,11 @@ AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523da
DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
DIST reg-0.15.5.tar.gz 4053475 BLAKE2B 60541d7f02f3ee658fa185206f76df1045975101f0a25a636493a454984a8a2c836b1b74f7b8b6768c66ce0e12b12708b3f42d233e15ba64f0251b02a841bb76 SHA512 c1293868ea30dcdfc5251f95a5f287f8043be3a2372fdd08c0836919f6722c5931eb429f9047769b442bf3fdbb50c476e8509c62cb20b4b45d30793571cce44e
DIST reg-0.15.6.tar.gz 4071110 BLAKE2B 376313ab4aef0f8bce21ddbed8f179aec14755990f6d99e5733c1550c58998f279e3c0beee7b2e11f25167bf7fb717dd731b69571adc410ad7475afcc98baef5 SHA512 1a5635af82f7a7951af325ffbc0d84c2e35ec0ecc040873ff7f0c7037fd2677cea235348c4fb0bf9397f1fd2ccee86e96ca080a1fbc28e60eb985e55e4a8a085
+DIST reg-0.15.7.tar.gz 4300839 BLAKE2B 67c9ca344e0a2984559c210cbdb4f5fc42f588f0c50a171c145bc63953b7540cbc166b51a5c209a2ece0c3b5647a34ffc1ac6b439b4e5a243e505c223a1a6fe5 SHA512 4c26aa0a438ac87208c4e269e16a994587ccdab38399a664638dd8c7407cf06f00c43a9c3c71cf4c88fa47a6e4466c8143ee7ee8130a8133518f5017ca34cc2d
EBUILD reg-0.15.4-r1.ebuild 1060 BLAKE2B 769a395dd1cfa2cbcdd691dc66a2e94f8b9efbbf24347dd9ebf56da7a6a705d6e057efaac9a227d9e22e52b679dda38ef3bbebab31c8f33b0989d5cd43f13e8b SHA512 8fc065165a355d2a8cdccd05b94fd49bf0513878f668a0123379adabe5b37a2b5e337bccd9906667ebce2f116837c1eca6923acbc57e017d9bb588e5ab40807d
EBUILD reg-0.15.4-r2.ebuild 1179 BLAKE2B afce38e0d6c9bc23af77eb7b995f0514b9b8d02d08c5f7c6a139b7643bcb3aad420d61a62deadb318e9ed0dca0d00e71407f4af914a435fbf75db1c6b0cf22d9 SHA512 18640a5b6fb4bb170dfa2ae7d6b9824e5bae12861cb8c699f31beb8bf8e183244840dfd4807d1703383fdd934e0dd621e2e24c55b95345f96724d08828166fa0
EBUILD reg-0.15.4.ebuild 836 BLAKE2B 5f6e3dcef97cdf67fbcc9d07b02ee66a611396fb98831f192e25e5af90fd8c01b9c15f4462008eae7f87174111a1e1f6902237380d7ffe49d151e5525698e0f3 SHA512 6e63c4018a663d0b65a35ea71cefc7dd4d62e3e16c2bc4c79cf38c25a5a2c9f07345f70f3267a356d46214a3092373651692d337798be8facca2b52f028c3405
EBUILD reg-0.15.5.ebuild 1129 BLAKE2B 0c25fae657e60bb37b2280b65155fada050ab43ab37af842a46c96e8e7016af9edb9548bb847767a19b77d8e9d2e82075cf9a8dc93a8eb3fae59ff00ca2cc384 SHA512 b61ce7b3da8566ed945e7d6c3dfd5eb95675aeda410c861730d99ca2da757d48916c3e02fd412c0a268f72971b8db71d79811f587b996b0e7a78dc5f17a3ce2d
EBUILD reg-0.15.6.ebuild 1129 BLAKE2B ca4bcb133ca79cf24a4d3bdc8892c45c749ec5452b1d0bdb181e077da8da6b4131c0031ce57d7d21727ef33750fd50d9e68ddf72c38547e7d2d8a69adf205c03 SHA512 97682e6928a03ee72ace0e673c60156e6d25160c239cea0e8bf8b7696ebbbcc7578974a1f607f1e4045b5a8c863049236ae1a3b52dd6a37795466f7878347248
+EBUILD reg-0.15.7.ebuild 1129 BLAKE2B 4544b2ad0c8bb6c8c5f78739dd8491011e4720d57a6ae33ec4b737934a04817e4f69ecfed4b6154c960b634936932d80982f2434c44e4410f10a871619b68fda SHA512 352bb21c0a996ef99e4e92de2e6f2647be886d4b113b12115e0613ff33390c4a70baaa934f559ef00dd232bb64c2a496f0a139748f829dc9d811c1d2e058c441
MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
diff --git a/app-emulation/reg/reg-0.15.7.ebuild b/app-emulation/reg/reg-0.15.7.ebuild
new file mode 100644
index 000000000000..b8476ff5ffcd
--- /dev/null
+++ b/app-emulation/reg/reg-0.15.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="a761fadc9a1f26a9da8113acc4ea5d8d5fbe5043"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.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"
+
+pkg_setup() {
+ enewgroup reg
+ enewuser reg -1 -1 /var/lib/reg reg
+}
+
+src_prepare() {
+ pushd src/${EGO_PN} || die
+ default
+ popd || die
+}
+
+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
+ 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/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 12da8bfb2a13..d5877486f046 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,7 +2,9 @@ AUX vagrant-r1.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49
AUX vagrant.in 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
DIST vagrant-2.1.1.tar.gz 1204711 BLAKE2B 88a6254091104eed702e07a4203a264b883869fb028b8d30fd51ddfc2053aec363683a2e73d1454ce92b705440920d5c80c0f967e4dc110bf425ce17973efccd SHA512 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5
DIST vagrant-2.1.2.tar.gz 1218801 BLAKE2B 742f27ca6c28c9738c09ef61c742be07121b5a804fa401115520633e5840c62c8e879fae078c5532704f6f6f7d7a9081d48e3f7570cfe6e6dd84f8df244a34ae SHA512 d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751
+DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
EBUILD vagrant-2.1.1.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
EBUILD vagrant-2.1.2-r1.ebuild 2357 BLAKE2B 069cdcd2ef93186b0c6c00e75d675f2cdbb62fb43964e8a653237ad5a811221b64409200d624255618398755112d42a7ece2258182deef4205cf96a89ae247ec SHA512 726d646c291ecd830fcbf6b7ca83ab53faac323d5ea1e75e0b32a975034416f407593abe8f5b9690c0784f3903ec75fc61e08b898ba176752f530fb3c871cca6
EBUILD vagrant-2.1.2.ebuild 2075 BLAKE2B 412016e151348fa62e3f94376a81e7c3420c70ac0dfbe8796314a5e2db27a9929c90087ca4e6ed56ef74bb9895ae7fdedc60ea4d5161ffac5c7727604c2ecd40 SHA512 1da7a6a487a76f98bf41da3f99312c1046ee98f36ce2fa3375d3284378c92feb01ab26539e4676d542f64cc2efe39d8f0f1a736072720c3d6ded73752c0992af
+EBUILD vagrant-2.1.5.ebuild 2319 BLAKE2B 0a39155b56b35e1cf83f1107819e93c8debf549cad72baf964030499007951c5733dbbf5e722bd2ff05ad88c7b1f19ce45a46d57aac2532a73ad1afc19ef1b3c SHA512 9f8e12bbed08e363c9457b7620db28d77888277e2747e21fe0abb91d372120098aa0a95649f1fa6b8c646b0d6fab96df28c46fb87a5f2983d472e315a6c73e0e
MISC metadata.xml 526 BLAKE2B ccdcda8f6095d1efa5a66bd3ef549d1039c719a4aaaa89efa2e776f466e38602f636d0d538a235a29bf0a5ea581bde659d4a77b6b4231da4c51e06913269aaad SHA512 784f97e3a9e96beba6afb232c46e6c42fe318b471125e48926363d9aec430ff4d37d74c82d2ee4efd1e036f89de2fe37415121dbbdd050a56954ba12d666b328
diff --git a/app-emulation/vagrant/vagrant-2.1.5.ebuild b/app-emulation/vagrant/vagrant-2.1.5.ebuild
new file mode 100644
index 000000000000..e147c40bcd3f
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+ app-arch/libarchive
+ net-misc/curl
+ virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+ >=dev-ruby/childprocess-0.6.0
+ >=dev-ruby/erubis-2.7.0
+ <dev-ruby/i18n-0.8.0:*
+ >=dev-ruby/listen-3.1.5
+ >=dev-ruby/hashicorp-checkpoint-0.1.5
+ >=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+ >=dev-ruby/net-ssh-5.0.0:*
+ >=dev-ruby/net-sftp-2.1
+ >=dev-ruby/net-scp-1.2.0
+ || ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+ <dev-ruby/mime-types-3:*
+"
+
+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
+ruby_add_bdepend "
+ >=dev-ruby/rake-10.0.0
+"
+
+all_ruby_prepare() {
+ # remove bundler support
+ sed -i '/[Bb]undler/d' Rakefile || die
+ rm Gemfile || die
+
+ # loosen dependencies
+ sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+ -e '/ruby_dep/s/<=/>=/' \
+ -i ${PN}.gemspec || die
+
+ # remove windows-specific gems
+ sed -e '/wdm\|winrm/d' \
+ -i ${PN}.gemspec || die
+
+ # remove bsd-specific gems
+ sed -e '/rb-kqueue/d' \
+ -i ${PN}.gemspec || die
+
+ sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+ newbashcomp contrib/bash/completion.sh ${PN}
+ all_fakegem_install
+
+ # provide executable similar to upstream:
+ # https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+ dobin "${PN}"
+
+ # directory for plugins.json
+ keepdir /var/lib/vagrant
+}