From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- app-emulation/Manifest.gz | Bin 19031 -> 19031 bytes app-emulation/cadvisor/Manifest | 3 + app-emulation/cadvisor/cadvisor-0.28.3.ebuild | 27 ++ app-emulation/cadvisor/files/cadvisor.initd | 18 + app-emulation/docker-compose/Manifest | 2 + .../docker-compose-1.18.0_rc2.ebuild | 71 ++++ app-emulation/free42/Manifest | 4 + .../files/free42-2.0.7-fix-build-intel-lib.patch | 12 + .../free42/files/free42-2.0.7-fix-makefile.patch | 58 ++++ app-emulation/free42/free42-2.0.7.ebuild | 49 +++ app-emulation/fuse-utils/Manifest | 4 +- app-emulation/fuse-utils/fuse-utils-1.3.3.ebuild | 30 -- app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild | 30 ++ app-emulation/fuse/Manifest | 6 +- app-emulation/fuse/fuse-1.3.8.ebuild | 64 ---- app-emulation/fuse/fuse-1.5.0.ebuild | 64 ++++ app-emulation/ganeti/Manifest | 11 +- ...st_agent-QEMU-Guest-Agent-sup.stable-2.17.patch | 122 ------- app-emulation/libdsk/Manifest | 4 +- app-emulation/libdsk/libdsk-1.5.4.ebuild | 18 - app-emulation/libdsk/libdsk-1.5.5.ebuild | 18 + app-emulation/libspectrum/Manifest | 4 +- app-emulation/libspectrum/libspectrum-1.3.6.ebuild | 35 -- app-emulation/libspectrum/libspectrum-1.4.1.ebuild | 35 ++ app-emulation/libvirt/Manifest | 2 +- app-emulation/libvirt/libvirt-3.10.0-r1.ebuild | 382 +++++++++++++++++++++ app-emulation/libvirt/libvirt-3.10.0.ebuild | 382 --------------------- app-emulation/lxc/Manifest | 17 +- .../lxc/files/lxc-1.0.11-bash-completion.patch | 27 ++ app-emulation/lxc/files/lxc-1.0.11-major.patch | 64 ++++ .../lxc/files/lxc-2.0.3-bash-completion.patch | 31 -- .../lxc/files/lxc-2.0.3-omit-sysconfig.patch | 5 - .../lxc/files/lxc-2.0.4-bash-completion.patch | 31 -- .../lxc/files/lxc-2.0.4-omit-sysconfig.patch | 5 - .../lxc/files/lxc-2.0.5-bash-completion.patch | 31 -- app-emulation/lxc/lxc-1.0.11.ebuild | 184 ++++++++++ app-emulation/lxc/lxc-2.0.3-r1.ebuild | 196 ----------- app-emulation/lxc/lxc-2.0.4.ebuild | 200 ----------- app-emulation/lxc/lxc-2.0.5.ebuild | 200 ----------- app-emulation/lxc/lxc-2.0.6-r1.ebuild | 201 ----------- app-emulation/playonlinux/Manifest | 2 +- .../playonlinux/playonlinux-4.2.12.ebuild | 2 +- app-emulation/spice-vdagent/Manifest | 1 - .../spice-vdagent/files/spice-vdagent.initd-2 | 60 ---- app-emulation/vagrant/Manifest | 4 +- app-emulation/vagrant/files/vagrant.in-r1 | 15 +- app-emulation/vagrant/vagrant-2.0.1-r1.ebuild | 78 +++++ app-emulation/vagrant/vagrant-2.0.1.ebuild | 78 ----- app-emulation/vice/Manifest | 6 +- 49 files changed, 1165 insertions(+), 1728 deletions(-) create mode 100644 app-emulation/cadvisor/cadvisor-0.28.3.ebuild create mode 100644 app-emulation/cadvisor/files/cadvisor.initd create mode 100644 app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild create mode 100644 app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch create mode 100644 app-emulation/free42/files/free42-2.0.7-fix-makefile.patch create mode 100644 app-emulation/free42/free42-2.0.7.ebuild delete mode 100644 app-emulation/fuse-utils/fuse-utils-1.3.3.ebuild create mode 100644 app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild delete mode 100644 app-emulation/fuse/fuse-1.3.8.ebuild create mode 100644 app-emulation/fuse/fuse-1.5.0.ebuild delete mode 100644 app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch delete mode 100644 app-emulation/libdsk/libdsk-1.5.4.ebuild create mode 100644 app-emulation/libdsk/libdsk-1.5.5.ebuild delete mode 100644 app-emulation/libspectrum/libspectrum-1.3.6.ebuild create mode 100644 app-emulation/libspectrum/libspectrum-1.4.1.ebuild create mode 100644 app-emulation/libvirt/libvirt-3.10.0-r1.ebuild delete mode 100644 app-emulation/libvirt/libvirt-3.10.0.ebuild create mode 100644 app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch create mode 100644 app-emulation/lxc/files/lxc-1.0.11-major.patch delete mode 100644 app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch delete mode 100644 app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch delete mode 100644 app-emulation/lxc/files/lxc-2.0.4-bash-completion.patch delete mode 100644 app-emulation/lxc/files/lxc-2.0.4-omit-sysconfig.patch delete mode 100644 app-emulation/lxc/files/lxc-2.0.5-bash-completion.patch create mode 100644 app-emulation/lxc/lxc-1.0.11.ebuild delete mode 100644 app-emulation/lxc/lxc-2.0.3-r1.ebuild delete mode 100644 app-emulation/lxc/lxc-2.0.4.ebuild delete mode 100644 app-emulation/lxc/lxc-2.0.5.ebuild delete mode 100644 app-emulation/lxc/lxc-2.0.6-r1.ebuild delete mode 100644 app-emulation/spice-vdagent/files/spice-vdagent.initd-2 create mode 100644 app-emulation/vagrant/vagrant-2.0.1-r1.ebuild delete mode 100644 app-emulation/vagrant/vagrant-2.0.1.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 9aa1d6b678e4..d676d41c2f40 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest index defc8ce796ef..619753253ad8 100644 --- a/app-emulation/cadvisor/Manifest +++ b/app-emulation/cadvisor/Manifest @@ -1,3 +1,6 @@ +AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429 DIST cadvisor-0.28.2.tar.gz 4109967 BLAKE2B c55268a0768adeea75ecc2baa1093d5d5360d1e0be56cea467fe759278c7047060c4b78179a3a35801afbcf6415ffbeb7e0649c92e79878e5615c73a37eeabeb SHA512 e682b8e062ba373e5726a8076d5be75322e7c592bd751aa32da9a99e5d380a77fc4b376aa478b0beff18bae2bc8432d3a70542605681410d5e1e0b1919a6c252 +DIST cadvisor-0.28.3.tar.gz 4110487 BLAKE2B d6b9d6de67e5672a3ba57ea0c28f38e2e96ec43910f8f5bbbe17b377ccbadf026d4418928234149e9ad3936f4c0871d7c371dda2bea49111735a33520154b2d3 SHA512 da111d74bfa3485c42a03a027ccbf833886e561f3244a081ad5439f7a714767cf4666c43c17b0b976089ea40916089aaa2c6070ec4aefc19798a1d5325e005e4 EBUILD cadvisor-0.28.2.ebuild 564 BLAKE2B 7e048727b92b8e24f69d67804f73b292806a0d60252a548796d2ba8a2f7d96f2e4da31c88cbc1c10d2fc796b6da7f079ab39e0cf2f0ce394210a16f7b298d053 SHA512 3673e73cbe50d3383d12580b7e1dad55e02c2aa229b27b3dd1e03299a8bbae3b8defc0661e369a68245a3fc4eb5ae0ca23384d36b4d1b33cccf99dcc70e0fe99 +EBUILD cadvisor-0.28.3.ebuild 606 BLAKE2B d05563f9fd2e57e2c817ab1ff977e52f61765ee7ac4144927d5aa80ecb4982f27eff9fce99d140beb57cf1349ae443be19b540a0836cf265d9dba55b1dd0d868 SHA512 6867dbc96bd9cb2689c6cb21ad4e0a895c6b5a96f733c048752e75d3c086fce42263867d5dfcbf2369c8fe662e2c5835e7b69a04042a4b8733ebeb70ce22e67e MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06 diff --git a/app-emulation/cadvisor/cadvisor-0.28.3.ebuild b/app-emulation/cadvisor/cadvisor-0.28.3.ebuild new file mode 100644 index 000000000000..c3666053995e --- /dev/null +++ b/app-emulation/cadvisor/cadvisor-0.28.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +EGO_PN="github.com/google/cadvisor" + +inherit user golang-build golang-vcs-snapshot +SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Analyzes resource usage and performance characteristics of running containers" + +HOMEPAGE="https://github.com/google/cadvisor" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /dev/null ${PN} +} + +src_install() { + newinitd "${FILESDIR}"/${PN}.initd ${PN} + dobin ${PN} +} diff --git a/app-emulation/cadvisor/files/cadvisor.initd b/app-emulation/cadvisor/files/cadvisor.initd new file mode 100644 index 000000000000..19e36b2c81a5 --- /dev/null +++ b/app-emulation/cadvisor/files/cadvisor.initd @@ -0,0 +1,18 @@ +#!/sbin/openrc-run +# Copyright 2016-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="cAdvisor - Analyzes resource usage and performance characteristics of running containers" +pidfile=${pidfile:-"/run/${SVCNAME}.pid"} +user=${user:-${SVCNAME}} +group=${group:-${SVCNAME}} + +command="/usr/bin/cadvisor" +command_background="true" +start_stop_daemon_args="--user ${user} --group ${group} \ + --stdout /var/log/${SVCNAME}/${SVCNAME}.log \ + --stderr /var/log/${SVCNAME}/${SVCNAME}.log" + +depend() { + after net +} diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 0d3fe960fa29..ed199f680111 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,5 +1,7 @@ DIST docker-compose-1.17.1.tar.gz 219947 BLAKE2B a5438e66f156b98ffc9ecf63a57443610f76713532369d519689b697dbc91bd196e24b831882a4c39a43c5b17640242d98f47a2c337832395dc48019d58e3e90 SHA512 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553 DIST docker-compose-1.18.0_rc1.tar.gz 230199 BLAKE2B ccec8431c75be2beaf988e1f10a7e4587f9708f4a4b55280e335783250665b7ff660f1a781aa42b59ee7529fc26abf00e438904c9f9ca4ac0210f1f55490c36a SHA512 9d3e437f9a0889dc09c1c5ad141c0ebcee05d8ac9ec0e842d1544b58ec651270f397e4d41f08d2eab98c4e43cd0cfa950f287d6bcf8095f7972ab46e5a9c1c33 +DIST docker-compose-1.18.0_rc2.tar.gz 229767 BLAKE2B 6f7b886cd3a52759868c3c23f86b402fffb197afb0eb4052e9aa363a5556e36aa129bbe0b7ea3bb1a29c3ab34053c12e93af02b558699b1391f6064ab060d91e SHA512 0c3e37d6116ca32c19399965b26311bd6fe115dd60058df7cffe176b47bb88b523e80a4f4fa5150d95ff7f90649638745da4c78c6a7264a84ac30ad92eb7bb44 EBUILD docker-compose-1.17.1.ebuild 2423 BLAKE2B 7433d3916716bc54512a96f7f5c21bea1a9e4adf5c1ae4365c557ad947c9e6b589adc3282be61a7ffb69da539bda12a1ef86b927864e5e1d801e65a971680758 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25 EBUILD docker-compose-1.18.0_rc1.ebuild 2422 BLAKE2B cf2b623a27b85b61e73bc93834b0027daa525a4c5d636dde1ab73573242330de8164a31528c76139ebef3467bde3c206d6865a2a9e58d0c8db37c505e5ed327d SHA512 48e9c336eea12efcfc1365e819ea09e6dfa0578545410f2a42f9c373780343bebb75e4579be0da71a9a02689ccbce5a42b87b2d97f4bbd46ae59c69d919b5218 +EBUILD docker-compose-1.18.0_rc2.ebuild 2422 BLAKE2B cf2b623a27b85b61e73bc93834b0027daa525a4c5d636dde1ab73573242330de8164a31528c76139ebef3467bde3c206d6865a2a9e58d0c8db37c505e5ed327d SHA512 48e9c336eea12efcfc1365e819ea09e6dfa0578545410f2a42f9c373780343bebb75e4579be0da71a9a02689ccbce5a42b87b2d97f4bbd46ae59c69d919b5218 MISC metadata.xml 429 BLAKE2B 5fcdac021eec2c1a600a4aaaefde691120f47d20fe1d5b218153e933f92f42d1008fc832139100cde6267f41adc33944efc378fed4205fd68c9240a8bdb46a1c SHA512 f6a0d1a934d1f825144fadbee8ab0fccceaf40af59cc44a90caed059a503672b18a1c16fee9bb045a9ab272ad5553b1d49fff67d43c7a8ff97dc5c31cdea37b6 diff --git a/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild new file mode 100644 index 000000000000..534ceb504f63 --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.18.0_rc2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2017 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://www.docker.com/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_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-2.6.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/six-1.3.0[${PYTHON_USEDEP}] + =dev-python/texttable-0.9[${PYTHON_USEDEP}] + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] + =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}" + +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/free42/Manifest b/app-emulation/free42/Manifest index adf1af51067a..fdab1d1e350f 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,5 +1,9 @@ AUX free42-2.0.6-fix-build-intel-lib.patch 690 BLAKE2B 0d8de8c32f92c01174e420e0dc74880bd3c3316c36dc947f84803a8f61ad491a0de9d27fa45ed7c72992b4e22c5e204bce27d47ec976048c4eff655d14312839 SHA512 624cf0af83f02b3a43231739de3d84e76cbdfe49becd219c9211cbc8ba7fc7d3474fc465edbf7e707f1474844e109d5d30361c7e15e3799db48bf0dda068d5ed AUX free42-2.0.6-fix-makefile.patch 1742 BLAKE2B 239bbb40c70a3627cf08859397bace5ecd6bbd215cc06f6d82862b908169af4851002fbb3cb7059aa553c3b7da266e5b0b2a1dede891a4f085822a2e731a9399 SHA512 d3add6369d6f2b5d4690355d93cfff903866f24aeed7d73246a79b4ba7b2551fec4ec61cf2d8c80d089194bf39f0c3a1faa4c6d1829f81b6c636b8f5d132b2bd +AUX free42-2.0.7-fix-build-intel-lib.patch 690 BLAKE2B c593eea5d157e967c09828e0c93c578cb6954b02c16adc19ef0b8185d11107cc236bb67098bc97da38cd5261b6a080081a8ed91ea9ae4bf6fce19dd0827eb033 SHA512 7c5b720be88acec3fdd3091b3cefeb67612487fbbbf50a4bb8b8b5734b3ac903e0183df8471f7730c82f74ae251180e9d90fe8a1246d9856067e892f08d11505 +AUX free42-2.0.7-fix-makefile.patch 1742 BLAKE2B a6dcc6bfb4d408a1b35a7a3f1dd2101135703d6ee2ed898d87c9bd730a114fd9ef584c47162ebd740e97b837bd4fe708c52994b5b5b0529101cd93d397314bc9 SHA512 c14e9f625a1fe86c5e56e2b1dc42bcf3a6fd5352d70691af95813a51bfbfde88035d221b1ddebf1a3013528407bb4992ad3d3f2e97b48d8606dfa5e96c121647 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d +DIST free42-nologo-2.0.7.tgz 7354850 BLAKE2B 6be2f2ea912a1d47bdf8c9016e8a32e5203d982e34cbe5ef6624eac078297cd967cf08ae2bdeb7c6ad158f96e77032f449a47f01c3c8d8e312f6d46e20237cf0 SHA512 1adfccb37bdf35ecd57a6da1633ceb3bcfd0681efbc34fc9a4e4580ce235e35db9281de0d9ba659ecd33ef2b3a17eae596047b6790ffbf3e5e5ebfad600dcb8b EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900 +EBUILD free42-2.0.7.ebuild 1040 BLAKE2B 3b04a83622ee7b6f0bbfd79137c6ea82dcce5438155b409a6161c878f5b6d794e4fb45cb01faf3ae53ad634cd37280ff415ae86ce64b48f9b9feb93c9413803b SHA512 c69790682e684bc136cd095bd093e8ac23e7fbff77081c88a395e3317473edc8fec1f2356ef50bd0d5e78f84086b2d28fc3bf8e4c668065190b141f995b8cc03 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb diff --git a/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch new file mode 100644 index 000000000000..04fc844599ef --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch @@ -0,0 +1,12 @@ +diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh +--- a/gtk/build-intel-lib.sh 2017-11-29 06:03:45.000000000 +0100 ++++ b/gtk/build-intel-lib.sh 2017-12-10 13:57:27.485971521 +0100 +@@ -4,7 +4,7 @@ + cd IntelRDFPMathLib20U1 + patch -p0 <../intel-lib-linux.patch + cd LIBRARY +-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 ++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 + mv libbid.a ../../gcc111libbid.a + cd ../.. + ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc diff --git a/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch new file mode 100644 index 000000000000..ccf18766bae2 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2017-11-29 06:03:45.000000000 +0100 ++++ b/gtk/Makefile 2017-12-10 14:01:06.715970583 +0100 +@@ -15,11 +15,11 @@ + # along with this program; if not, see http://www.gnu.org/licenses/. + ############################################################################### + +-CFLAGS = -MMD \ ++CFLAGS := -MMD \ + -Wall \ + -Wno-parentheses \ + -Wno-write-strings \ +- -g \ ++ -Wno-error=narrowing \ + -I/usr/X11R6/include \ + $(shell pkg-config --cflags gtk+-2.0) \ + -DVERSION="\"$(shell cat ../VERSION)\"" \ +@@ -27,21 +27,25 @@ + -DDECIMAL_GLOBAL_ROUNDING=1 \ + -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ + -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ +- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 ++ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ ++ ${CFLAGS} + +-CXXFLAGS = $(CFLAGS) \ ++CXXFLAGS := $(CFLAGS) \ + -fno-exceptions \ + -fno-rtti \ +- -D_WCHAR_T_DEFINED ++ -D_WCHAR_T_DEFINED \ ++ ${CXXFLAGS} + +-LDFLAGS = -L/usr/X11R6/lib +-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) ++MYLDFLAGS = -L/usr/X11R6/lib ++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0) + + ifeq "$(shell uname -s)" "Linux" +-LDFLAGS += -Wl,--hash-style=both ++MYLDFLAGS += -Wl,--hash-style=both + LIBS += -lpthread + endif + ++MYLDFLAGS += ${LDFLAGS} ++ + SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ + shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ + core_commands3.cc core_commands4.cc core_commands5.cc \ +@@ -83,7 +87,7 @@ + endif + + $(EXE): $(OBJS) +- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) ++ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) + + $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks + diff --git a/app-emulation/free42/free42-2.0.7.ebuild b/app-emulation/free42/free42-2.0.7.ebuild new file mode 100644 index 000000000000..6e2ba52edf22 --- /dev/null +++ b/app-emulation/free42/free42-2.0.7.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="http://thomasokken.com/free42/" +SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa" + +DEPEND="dev-libs/atk + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND} + x11-libs/libX11 + x11-libs/libXmu" + +S="${WORKDIR}/${MY_PV}" + +src_prepare() { + default + sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ + "${S}/gtk/shell_main.cc" || die + epatch "${FILESDIR}"/${P}-fix-makefile.patch + epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch +} + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk" +} + +src_install() { + dodoc CREDITS HISTORY README + dobin gtk/free42dec +} diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest index 2b01023bf89d..1254169d478d 100644 --- a/app-emulation/fuse-utils/Manifest +++ b/app-emulation/fuse-utils/Manifest @@ -1,5 +1,5 @@ -DIST fuse-utils-1.3.3.tar.gz 491483 BLAKE2B de415ef74aacd69cb03d41d1106f1297dc24a213b962f11914be1419a35666afa78a5f22708230c447abea28ac6ce32d1c037914981de56220a24c99ebfb1594 SHA512 f2b0afc61b178ae51f2dcbff70112e35213efe8885e4f89903d02e5613652b0620bc6fbf80cfb8ca761324894e2913739b9083f91a03e689086051f83d182805 DIST fuse-utils-1.3.4.tar.gz 493813 BLAKE2B 29ff39a3dc98019aa548b78d7e3c0fe08863ea4f51103b5e0949b96e83a217458771c19a72f7a93150b2654903904343f038032442f74c662ccaaec56f05c997 SHA512 878f0481f7b62a989c1c1e947996b9c3ffafbfde4eb6c0af46aaabe765768f308ca26d3a451f438e48c795a6f08791c9ebf672448519a5d0790d5781c9bad6bb -EBUILD fuse-utils-1.3.3.ebuild 771 BLAKE2B 69d8daf9ca1c6e9f5f3e279e959293d67cfbc7a60a92010ce861ef29fec9325f5c12a38ce431e320c98062719f6d501c9b9b0c536ae73be51d0ff93377c1db50 SHA512 56afe09e84ce5371d454fad7f368225da572c5050bfee12e638d1458981e22a14d408f28d3abae548349ecee0a3bcb6045bf165680f91d89612a336a735cdbe6 +DIST fuse-utils-1.4.0.tar.gz 499865 BLAKE2B 23a09e88a468b207fa1b0782535251729d8212092da6d04c2732171ebb88e453a9df1f9af3056fa3114f4e6717a4e54c95d5b1a71477980f54d274b05e0c210b SHA512 dafedc66659c0f89d90bed2dcdc76aecddd91818db5f843d7480c78eaaa4c298531936af1fe34a4997ca23aab7b32dabf4b8bc03a552e75370edfd56aee0c2b4 EBUILD fuse-utils-1.3.4.ebuild 771 BLAKE2B c1249909dc4931c75827dbe1785770669bd4d48334885b322961525a6c32e5d0068d372df5a2fd1e13e27c3b817929f8058525d491cd5112d317872df997eea1 SHA512 e75cc92b24eb7ea5395153b702bc40f27b449aab9dc7196f62fa9a84afa1bc06d36df8d3ca14bac166c0432cca60eb063006e385777903f0d49131e610dc98f9 +EBUILD fuse-utils-1.4.0.ebuild 771 BLAKE2B b90ba227465b04ad33797ae1e181aa4ec789c9cd2108b42d1cbeb7312d2822bdc38495b71413441fcf100c6a1bceae22721a0ae574384f2b361c86d045757311 SHA512 84c53a9ccb3ec7d1122ec0b2d8d3017e392743f37bf7eea0013c4a02b9b2bf0dd4db1904af622fa83261baf3573cffe7031ebe88d1adfbbc804a455a110caf6f MISC metadata.xml 602 BLAKE2B 434afcae9b53d97c7c5ed9f4c5dca410f6f5b39716b751a5a04458a9420652b8403dbbe1d24f73ebaebea34f45f7d6138ade181388772a5294419c86fd033d78 SHA512 42657b608b54739aa7d1cc56c7172bac79b00d327594334e13c471fa52c5d2e026aedff351758b5a292bc89b19d340ee04727ed5a551b9f6c944b096762dae17 diff --git a/app-emulation/fuse-utils/fuse-utils-1.3.3.ebuild b/app-emulation/fuse-utils/fuse-utils-1.3.3.ebuild deleted file mode 100644 index 9c742e03aedc..000000000000 --- a/app-emulation/fuse-utils/fuse-utils-1.3.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Utils for the Free Unix Spectrum Emulator by Philip Kendall" -HOMEPAGE="http://fuse-emulator.sourceforge.net" -SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="audiofile gcrypt jpeg png zlib" - -RDEPEND=">=app-emulation/libspectrum-1.3.6[gcrypt?,zlib?] - audiofile? ( >=media-libs/audiofile-0.3.6 ) - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - $(use_with audiofile) \ - $(use_with gcrypt libgcrypt) \ - $(use_with jpeg libjpeg) \ - $(use_with png libpng) \ - $(use_with zlib) -} diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild new file mode 100644 index 000000000000..84c472b51b3b --- /dev/null +++ b/app-emulation/fuse-utils/fuse-utils-1.4.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Utils for the Free Unix Spectrum Emulator by Philip Kendall" +HOMEPAGE="http://fuse-emulator.sourceforge.net" +SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="audiofile gcrypt jpeg png zlib" + +RDEPEND=">=app-emulation/libspectrum-1.4.1[gcrypt?,zlib?] + audiofile? ( >=media-libs/audiofile-0.3.6 ) + jpeg? ( virtual/jpeg:0 ) + png? ( media-libs/libpng:0 ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_with audiofile) \ + $(use_with gcrypt libgcrypt) \ + $(use_with jpeg libjpeg) \ + $(use_with png libpng) \ + $(use_with zlib) +} diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest index d0083e948409..83b7e0e8c40a 100644 --- a/app-emulation/fuse/Manifest +++ b/app-emulation/fuse/Manifest @@ -1,5 +1,5 @@ -DIST fuse-1.3.8.tar.gz 1645303 SHA256 299b7efe342c6268a05e805c20427083bcec127ad36b1ebfd4ae7294978a7de1 SHA512 e048d984bfc405e8e9801812fcf4b0b62c8bdb67eb573a815157a1f76e4c752303c919dc62b351db25c156b944c4b1b6d28595f8ce86390221039852baf13aa6 WHIRLPOOL a1dec25d878e49c11a4d69b59cce594a4a0ee075ad7b758eaa9afda9dfc6cbb2f6fded96938c4ca8473416f7f741cf3d4314fcf015aaacdb87b69387378a1ed0 -DIST fuse-1.4.0.tar.gz 1652821 SHA256 75ac811534c7e352f238b1959a7f6478661bc4103f96dd1166ec395ad7523d97 SHA512 e5d0e65820f54d0ac0447d50aa89ea4ba3e6bb717e270ae813c640a9b36fe015c68f194edacb5cbe8899ee7893c30cab4493ed297919e962e722e9d3e1f72001 WHIRLPOOL 64f043b26ff5e6dcc0c1f33c106328c61ac86c16844f9d56951737c96e1fdb20ed196edb2940a220089ed05e8ba524621b65f2984a9aa04d88ae67dd7123dcef -EBUILD fuse-1.3.8.ebuild 1507 BLAKE2B 73f1c3549a2e9de9b638443639e17fd20744cf8316244807bd50f4624a88a2fa42db5afe8a86593dee0d5307bee9786596e9ce3a2740ff89475091ee6c987f12 SHA512 717c7b2961bdc74e90b55366829f149834a338de61fbe06de274d3e62f51d28bfc6ac4932ce8b9243419b5e5b8eab2d65e4bcfb95e1eef82f2b2b700a2d18169 +DIST fuse-1.4.0.tar.gz 1652821 BLAKE2B b7d8c5cd8c5fb13e077029eeee6283c9d2a114057c83e29bacc1d99933b338011ce255b5df34b6039bcf03410af46bf586cb6d6ec038d53b8e83bad2308d2ed1 SHA512 e5d0e65820f54d0ac0447d50aa89ea4ba3e6bb717e270ae813c640a9b36fe015c68f194edacb5cbe8899ee7893c30cab4493ed297919e962e722e9d3e1f72001 +DIST fuse-1.5.0.tar.gz 1619748 BLAKE2B 6ffbea1c7a6572f2cdd3d293a438f6e37da2eadf299396358bed2e65db3aa9720333b62b28b4f0064ec5434c99a6a0b790737230f8ec0c01f96e50f594305bd1 SHA512 c13fdef6b23377e7d2b53e7f5b2db01447d12eafc0b9114fd8b83cd5058964a655a720810ab7dc6a6e1a1d9a33ffc787b5e46bf54df1259f4ba0ff78c3189421 EBUILD fuse-1.4.0.ebuild 1507 BLAKE2B db532c1f3e39fda1363069297ad6a78a570affef437d7ad208411f413c32e25884f29e6be80b6d684c8db57bfdf78def7f4a6d82bf76f46cfd836a80c7623bbc SHA512 e2ad4dc8e36405cd791d631897f2da902f2e90550383d06572d027f1e21d6193036b82367290329e60a8c570a0999158cedef60cf22d80195998f77a0b1e190b +EBUILD fuse-1.5.0.ebuild 1507 BLAKE2B fe247d5184e1a7e62824e04e09befd94294a673405cdbc0e0ece8e04f55d8aa52299050ff866ecace56d6f606fc884803a21f6628974c6d4962d69a61414925d SHA512 46c71560082e570e34eeb6d04ff6c2352e2f0cc8a2564879ef7737de7678cd075463524e5b2ba6d136d975a1391ff0ebc07f8f646716330751df560ce56db5f9 MISC metadata.xml 463 BLAKE2B 6d6d3856e855523101aec81d8643c3b21dfe9748c34953fcaa478e60ace0122ac3f307c2f21bd41e952a953b37488f3649c57e12549520e1b3fe9985c9f6c1f7 SHA512 dce77f13c89a1e08aeba516eef1c8ca0a6fcf43167ed309971181ff133f221a50a73f6588ce4556e3cfadf62df8f00eb4c8d001acb5062909d7cb9bfcf3f6a80 diff --git a/app-emulation/fuse/fuse-1.3.8.ebuild b/app-emulation/fuse/fuse-1.3.8.ebuild deleted file mode 100644 index bc9666f22b29..000000000000 --- a/app-emulation/fuse/fuse-1.3.8.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" -HOMEPAGE="http://fuse-emulator.sourceforge.net" -SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml" - -# Only one UI back-end can be enabled at a time -REQUIRED_USE="^^ ( X fbcon gtk sdl svga )" - -RDEPEND=">=app-emulation/libspectrum-1.3.6 - dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - gpm? ( sys-libs/gpm ) - gtk? ( x11-libs/gtk+:3 ) - joystick? ( media-libs/libjsw ) - png? ( media-libs/libpng:0= sys-libs/zlib ) - sdl? ( media-libs/libsdl ) - svga? ( media-libs/svgalib ) - X? ( x11-libs/libX11 - x11-libs/libXext ) - xml? ( dev-libs/libxml2:2 )" -DEPEND="${RDEPEND} - fbcon? ( virtual/linux-sources ) - dev-lang/perl - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog README THANKS ) - -src_configure() { - local guiflag - - if use gtk; then - guiflag="" - elif use sdl; then - guiflag="--with-sdl" - elif use X; then - guiflag="--without-gtk" - elif use svga; then - guiflag="--with-svgalib" - elif use fbcon; then - guiflag="--with-fb" - fi - - econf \ - --without-win32 \ - ${guiflag} \ - $(use_with alsa) \ - $(use_with ao libao) \ - $(use_with gpm) \ - $(use_with joystick) \ - $(use_enable joystick ui-joystick) \ - $(use_enable memlimit smallmem) \ - $(use_with png) \ - $(use_with xml libxml2) -} diff --git a/app-emulation/fuse/fuse-1.5.0.ebuild b/app-emulation/fuse/fuse-1.5.0.ebuild new file mode 100644 index 000000000000..36d3680379f3 --- /dev/null +++ b/app-emulation/fuse/fuse-1.5.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" +HOMEPAGE="http://fuse-emulator.sourceforge.net" +SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml" + +# Only one UI back-end can be enabled at a time +REQUIRED_USE="^^ ( X fbcon gtk sdl svga )" + +RDEPEND=">=app-emulation/libspectrum-1.4.1 + dev-libs/glib:2 + alsa? ( media-libs/alsa-lib ) + ao? ( media-libs/libao ) + gpm? ( sys-libs/gpm ) + gtk? ( x11-libs/gtk+:3 ) + joystick? ( media-libs/libjsw ) + png? ( media-libs/libpng:0= sys-libs/zlib ) + sdl? ( media-libs/libsdl ) + svga? ( media-libs/svgalib ) + X? ( x11-libs/libX11 + x11-libs/libXext ) + xml? ( dev-libs/libxml2:2 )" +DEPEND="${RDEPEND} + fbcon? ( virtual/linux-sources ) + dev-lang/perl + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog README THANKS ) + +src_configure() { + local guiflag + + if use gtk; then + guiflag="" + elif use sdl; then + guiflag="--with-sdl" + elif use X; then + guiflag="--without-gtk" + elif use svga; then + guiflag="--with-svgalib" + elif use fbcon; then + guiflag="--with-fb" + fi + + econf \ + --without-win32 \ + ${guiflag} \ + $(use_with alsa) \ + $(use_with ao libao) \ + $(use_with gpm) \ + $(use_with joystick) \ + $(use_enable joystick ui-joystick) \ + $(use_enable memlimit smallmem) \ + $(use_with png) \ + $(use_with xml libxml2) +} diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index 5a87bcfe8812..d91096b7bc3c 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -1,6 +1,5 @@ AUX 0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch 5273 BLAKE2B 30961f0223ab31b58823c2b4adb5704435592b7c3264c6f0e204a1cbfa787a54d97d59dc30287bc678a57d4a9d12eb8495d3a72f8c2e754f0bcb3cd4045017be SHA512 a028d2075eb5b004dcd8666fcded285ddaccb17a511cf10e7c8f2d882b597f1d20c5b23cb4922d595bebc420669b52bbe273f44d0b1d6a57ee263e934ad3806e AUX 0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.16.patch 5277 BLAKE2B cb4c45ad078cc9f16ccc1ac9cc4ad7e0707c1014ed0e8c90e027bb2bcf34154df58f0c1143299637e0df957b1203f47d1453a46611d9e9bf89da1242cc58ab50 SHA512 ed87ad5cf1322fde341a2e88b619a4a124548693f02e3f599d9369b46a0a388b4108b9b2a45772bc52bd451cd7a200292ab6680c0ff363ede0a19070694b78d6 -AUX 0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch 5277 BLAKE2B 0b6098dab07871bb6cca31b4e100ed3eca14ba04602a27359e055afed15ddd3f709892e18dc470fca9b12298d46560ed6ec97414b91715a68585de59a005ca97 SHA512 4f5c2c80bbfd83f614e1a5fd6a7137e439791a159ce3863d6f78421e6cc90740a1c1e06080371386c0cbc69f28491630a43a82755aea6fab8cf030e6079b335b AUX fix_ftbfs_with_sphinx_1.4 2019 BLAKE2B d8406a9ada3b9235def6c71894a6db80d3f3ecbeb5d4d5835755c046cff62988aead25c704469ad0d835c816a0c372e1e8d48cbc29b0f6bc16c8b59fa9f33ee4 SHA512 3f4ea77cfa94f0edca23910d1d395c0d704e2b1f1a0bd98b96609ff16d295ea34e179224cad51cb9eb34c1b470fa387fe9a33f9d08a08916d88ce25ba93d551f AUX ganeti-2.10-rundir.patch 1305 BLAKE2B 14ef1e0396251ffd4b01371c3f4fdedbe3dc500da9aa4485b052e2d2ee0f23092ccd6fe21d2945d2f2d64490e90a985bb5e6f8707a5035dd3ef4e91bc0ec92fd SHA512 67a475c8e4ed9fd7d28bcf514fff5dd3ea6a458f57e02138b9fe6b1288732dfb3fc4e2fe1586dc5f78c1cda5733b5163f723709f37c4ded1a99d8b0b2773f61d AUX ganeti-2.11-add-pgrep.patch 760 BLAKE2B 6f54b84235ab53cc4a9cdef70d007209b8dd75ecb2f8a736aa11aa706cfd215f23970af307de42408316d5a10b64563b56fa25a78a2b44e6f9674301ae9f1ee2 SHA512 2916e9207104a33027b5024e262863d8f6413558e866b0822c801d9dbfa9d0350553b51e855dbaea372257ee7b3158823c45dbe5594b786d6d9327977a12f57c @@ -27,11 +26,11 @@ AUX ganeti-kvm-poweroff.initd 1502 BLAKE2B baeef3110b3e16e7aba443b4e1cb0b1586949 AUX ganeti-lockdir.patch 468 BLAKE2B b3684c79376ab468b4162de9104291c89f73cf69fed9fb452ee9a0073de69c49458d115694b9bcc53d308751a3c4a6a84bda07b93a2431f357df238061f514b4 SHA512 1581e4e60dcd2f615a7c6366550dd367b1aba8e422e70db17cb02fb1ed109827d4e8ef9898f417680c4377235cf8dd4770fab21895ca26f3f490ea54f1c0e3f6 AUX ganeti.confd-r2 422 BLAKE2B 384e4e479fcf3fe57c45c18cf16bfca84f03eda2e7a60e5512dbb5122a33c300469c3315cd41b621e86e850ed3bcb49822de93b35f40a156f7e7e38aef228619 SHA512 4ac93d7c252c3b4dbba4146e991fdb49f4cf832cc96c48425748d279c459c5e4a8a8e1bdbc719027a7bd751896b469b996ed324bc180c9c674030eeb0b7a0d9a AUX ganeti.initd-r3 2602 BLAKE2B 4a8ebd292cfd922aed63c7db739cbcc51924c85b3074afd5adab32376a1ce5ba5f4954ea2d299aaff5af009fc0fa6344c04de7f7cb1a45b5ff5f804cfd207017 SHA512 e4dd9cfe5ee41b70ecb45786991e22e3d1dac92c1ee14a9020fc4c62b94ae6f0a2a79c20e685e880b5d83c959cc759a3500f3f78b5f57c1ae3c6261b57c16928 -DIST ganeti-2.15.2.tar.gz 4723007 SHA256 1e09d29cae5020142d20a96165b23f3b62b5511b875051b6374d09c4c13c0b83 SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 WHIRLPOOL a09a13d64e7c6fa7823072d767fa6495cd814bb22e7a5fc708c8b339103a41da4e45f38574a2c665fe89c8774f220a2715c3aba180eb674eae603730dd2d25ad -DIST ganeti-2.16.0~rc1.tar.gz 4794934 SHA256 014cbc02b05c681ef216791d23de33e3355adf2153fede91c4fb09f924efb5f1 SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be WHIRLPOOL e5a367ca728757a1a406519110b232875800ed5efe3dc4ba33ab2f0e97e0112d3eebf6235786e2074397c363a73991bf80ed21684a8b608eaba74b3ec102070b -DIST ganeti-2.17.0~beta1.tar.gz 4880091 SHA256 57de10d300ee4a1b4f1a6625ef24ad4a459c6c5bf1ea83d73a95b0cf9cb6ddb9 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e WHIRLPOOL 3d2ba633e1a4b0c14ece75b1144920720497b533f83c93af3bdf6c2dcdefd3269b581ad4f75497866613ae3a51805ba855aa55b29c6271b9f660b96d48f56a64 -DIST ganeti_2.15.2-4.debian.tar.xz 42440 SHA256 d2b907ad54b6fad8bc9c023c718c6f1a35cbc487fa065291f465f1e518df6d02 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 WHIRLPOOL 16acab23919541bfd1748ff9f5e243c483ed4b5b10bcd5c233821c06968671ce0fcdab86ec95a30f6162a308df1eca16424e94b80ea095dfc90931a4be930b26 -DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 SHA256 bb97edb134d45dffb2678604dff7f3b91904aa4b4e16c3c29e44e9919e45a737 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af WHIRLPOOL 11712b4232ec1e7401d2e8fbf2c66465ffacfb52129dc7d2736cfcb45140ef7734a43510688fd2b8dbac088b6547aacadd596d0def64f9a1cd1f3b88c053f39c +DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb8e6b397f86174cb3d48ec846fd3d146737240eea9ec0ce6fd9d07e04a27831a45a4354d3d49597b9f5cff33d7b SHA512 e0707aa535857779622e0eb18cccb89bc34fe4acf373628c30524e3f7e572c4b3d628946ad219149c14615d6471c4d72dbd0c6e3e1855a9f3644b4605544df85 +DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be +DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e +DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 +DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af EBUILD ganeti-2.15.2-r5.ebuild 9912 BLAKE2B a82f68ae78f5e0b1d292aee484b4b32ae6d3a2df01fac8df7f8a5d19b80c0b1a6bbfa9ef23a81926c1ca11a053e037e3d4423e9855ca447fb3acaed6f6e144da SHA512 1cd83b2736ad9a2223b95a8ec7068616773686448b37696434e67ee13d6e147c2ba3dcd849d6cb208af29dde9c1990cf766d75c1d71d5352566cc23da9c182e6 EBUILD ganeti-2.15.2-r6.ebuild 10325 BLAKE2B 8b2c214c900fdfaa1c2a90742163091fafa219e556a5d042c7293ad5f0313273c78414d804608a69b9658e57b73c850172992466ee041ab2b6c06d47f1038e3e SHA512 a9e2e810b85ed6c359fd3e011143c57ee2b28632ed0e1978bf698a50af17dd814ae61e64efb1152dd00b817eb89a20549d83816dd2110974b59a24d69f5be2f7 EBUILD ganeti-2.16.0_rc1.ebuild 10456 BLAKE2B 15679fa94bb655a3f25cac0d6826f671cce5d81aec544410a356605ec82a1aca519285605d43f6fa542af56ead84c0f60908088be9c55cbd43e0b165745735a0 SHA512 2c1f9579e275f587dece7471bd48ebf88faae241238bc20d3504711b976e5d0a8be6b0a36426a315733c0068994ba1487ee2ac5eaab63a683bb282e7e1aa55c9 diff --git a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch b/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch deleted file mode 100644 index f7a664fa776d..000000000000 --- a/app-emulation/ganeti/files/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.17.patch +++ /dev/null @@ -1,122 +0,0 @@ -From e91ae73f593115dba1f77af6a3af30cf2219f880 Mon Sep 17 00:00:00 2001 -Message-Id: -From: "Robin H. Johnson" -Date: Thu, 29 Sep 2016 08:57:28 -0700 -Subject: [PATCH-2.17] kvm: use_guest_agent: QEMU Guest Agent support - -Implement the QEMU Guest Agent sockets, so that code/scripts on the -hypervisors can communicate with guest operating systems easily. - -Signed-off-by: Robin H. Johnson ---- - lib/hypervisor/hv_kvm/__init__.py | 23 +++++++++++++++++++++++ - man/gnt-instance.rst | 7 +++++++ - src/Ganeti/Constants.hs | 5 +++++ - 3 files changed, 35 insertions(+) - -diff --git a/lib/hypervisor/hv_kvm/__init__.py b/lib/hypervisor/hv_kvm/__init__.py -index ac02ff56c..b865d6f3a 100644 ---- a/lib/hypervisor/hv_kvm/__init__.py -+++ b/lib/hypervisor/hv_kvm/__init__.py -@@ -497,6 +497,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): - constants.HV_MIGRATION_BANDWIDTH: hv_base.REQ_NONNEGATIVE_INT_CHECK, - constants.HV_MIGRATION_DOWNTIME: hv_base.REQ_NONNEGATIVE_INT_CHECK, - constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK, -+ constants.HV_USE_GUEST_AGENT: hv_base.NO_CHECK, - constants.HV_USE_LOCALTIME: hv_base.NO_CHECK, - constants.HV_DISK_CACHE: - hv_base.ParamInSet(True, constants.HT_VALID_CACHE_TYPES), -@@ -750,6 +751,13 @@ class KVMHypervisor(hv_base.BaseHypervisor): - """ - return utils.PathJoin(cls._CTRL_DIR, "%s.qmp" % instance_name) - -+ @classmethod -+ def _InstanceQemuGuestAgentMonitor(cls, instance_name): -+ """Returns the instance serial QEMU Guest Agent socket name -+ -+ """ -+ return utils.PathJoin(cls._CTRL_DIR, "%s.qga" % instance_name) -+ - @classmethod - def _InstanceKvmdMonitor(cls, instance_name): - """Returns the instance kvm daemon socket name -@@ -836,6 +844,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): - utils.RemoveFile(cls._InstanceMonitor(instance_name)) - utils.RemoveFile(cls._InstanceSerial(instance_name)) - utils.RemoveFile(cls._InstanceQmpMonitor(instance_name)) -+ utils.RemoveFile(cls._InstanceQemuGuestAgentMonitor(instance_name)) - utils.RemoveFile(cls._InstanceKVMRuntime(instance_name)) - utils.RemoveFile(cls._InstanceKeymapFile(instance_name)) - uid_file = cls._InstanceUidFile(instance_name) -@@ -1544,6 +1553,20 @@ class KVMHypervisor(hv_base.BaseHypervisor): - if self._UUID_RE.search(kvmhelp): - kvm_cmd.extend(["-uuid", instance.uuid]) - -+ # Add guest agent socket -+ if hvp[constants.HV_USE_GUEST_AGENT]: -+ qga_addr = utils.GetFreeSlot(bus_slots[_PCI_BUS], reserve=True) -+ qga_pci_info = "bus=%s,addr=%s" % (_PCI_BUS, hex(qga_addr)) -+ qga_path = self._InstanceQemuGuestAgentMonitor(instance.name) -+ logging.info("KVM: Guest Agent available at %s", qga_path) -+ # The 'qga0' identified can change, but the 'org.qemu.guest_agent.0' string is -+ # the default expected by the Guest Agent. -+ kvm_cmd.extend([ -+ "-chardev", "socket,path=%s,server,nowait,id=qga0" % qga_path, -+ "-device", "virtio-serial,id=qga0,%s" % qga_pci_info, -+ "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0", -+ ]) -+ - if hvp[constants.HV_KVM_EXTRA]: - kvm_cmd.extend(hvp[constants.HV_KVM_EXTRA].split(" ")) - -diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst -index 283392cc8..493ae929d 100644 ---- a/man/gnt-instance.rst -+++ b/man/gnt-instance.rst -@@ -545,6 +545,13 @@ viridian - viridian (Hyper-V) for this instance. The default is false, - disabling viridian support. - -+use\_guest\_agent -+ Valid for the KVM hypervisor. -+ -+ A boolean option that specifies if the hypervisor should enable -+ the QEMU Guest Agent protocol for this instance. By default, the -+ Guest Agent is disabled. -+ - use\_localtime - Valid for the Xen HVM and KVM hypervisors. - -diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs -index 13bff2e71..7f43f89f9 100644 ---- a/src/Ganeti/Constants.hs -+++ b/src/Ganeti/Constants.hs -@@ -1821,6 +1821,9 @@ hvUsbMouse = "usb_mouse" - hvUseBootloader :: String - hvUseBootloader = "use_bootloader" - -+hvUseGuestAgent :: String -+hvUseGuestAgent = "use_guest_agent" -+ - hvUseLocaltime :: String - hvUseLocaltime = "use_localtime" - -@@ -1955,6 +1958,7 @@ hvsParameterTypes = Map.fromList - , (hvUsbDevices, VTypeString) - , (hvUsbMouse, VTypeString) - , (hvUseBootloader, VTypeBool) -+ , (hvUseGuestAgent, VTypeBool) - , (hvUseLocaltime, VTypeBool) - , (hvVga, VTypeString) - , (hvVhostNet, VTypeBool) -@@ -4111,6 +4115,7 @@ hvcDefaults = - , (hvMigrationBandwidth, PyValueEx (32 :: Int)) - , (hvMigrationDowntime, PyValueEx (30 :: Int)) - , (hvMigrationMode, PyValueEx htMigrationLive) -+ , (hvUseGuestAgent, PyValueEx False) - , (hvUseLocaltime, PyValueEx False) - , (hvDiskCache, PyValueEx htCacheDefault) - , (hvSecurityModel, PyValueEx htSmNone) --- -2.11.0.rc2 - diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest index 11b9f711ced0..f1b5738adebb 100644 --- a/app-emulation/libdsk/Manifest +++ b/app-emulation/libdsk/Manifest @@ -1,3 +1,3 @@ -DIST libdsk-1.5.4.tar.gz 1211575 BLAKE2B 252a90f8ecea1ce2d525bb66b1efa5896065dc0ceadf9170fedf3362626f905b89f5092afe701654a4e9a3fe732c877958f4c6c3107eabc6f451923e88246a3c SHA512 df5781a1c75d18897eaeb298222515241d7f0e3bfc6b88a15557f809ddb6674347a84227028dd9915b1086e9bb5481280e0337fc9167b7ba0e888e77c9d448c2 -EBUILD libdsk-1.5.4.ebuild 448 BLAKE2B dd1aa87a7283d8cf659171960ecf39045062ba1cfcf97c928a9e0113395a0fb12096cfbe89190877c051d62a6bd30f8d8c4dae2062f82437d267fba4f8a0684a SHA512 1fffcc2c770274b3017599f1c0bedf3a7724e5d8de4bf2345d4ffceb3d5c6cebb06812e3b7af2ed2959a398d94090a217a9077d7f2010cc77c8b5418304c3c75 +DIST libdsk-1.5.5.tar.gz 1211603 BLAKE2B 678f2fd4f7c275e413f3626858368ba631a03ba06079e0e5a76b792fd664e09df8bab3c7773365bbda4d2cbe27730fc2d46d4e4bf68828e0beab30b87147088d SHA512 58d5f78e7c83870f62804278ab4a801086763c5fda7bf8740edec3b9e69b35ececa98c9c6689dcd4b31053fa392952362ac461956b00f6f17a5da4b56aa6342b +EBUILD libdsk-1.5.5.ebuild 448 BLAKE2B dd1aa87a7283d8cf659171960ecf39045062ba1cfcf97c928a9e0113395a0fb12096cfbe89190877c051d62a6bd30f8d8c4dae2062f82437d267fba4f8a0684a SHA512 1fffcc2c770274b3017599f1c0bedf3a7724e5d8de4bf2345d4ffceb3d5c6cebb06812e3b7af2ed2959a398d94090a217a9077d7f2010cc77c8b5418304c3c75 MISC metadata.xml 250 BLAKE2B 4d107336753f39398ae054c9c143bd7a5528a3cecf12ac4f32ba37b2ed15ccefbbd4462239b98b5b239fc3fd2588ea313c2e68c06e889a16a16162af54348295 SHA512 edfbc7db743ecc341349b3ebd5c1367e100dd1999194001f6de526be5fbf340daf8ebb9a70b4b4b069178219c37a8c4e161afc2650997070dd3be113d091d077 diff --git a/app-emulation/libdsk/libdsk-1.5.4.ebuild b/app-emulation/libdsk/libdsk-1.5.4.ebuild deleted file mode 100644 index d7b91ae18fbb..000000000000 --- a/app-emulation/libdsk/libdsk-1.5.4.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="LIBDSK is a library for accessing discs and disc image files" -HOMEPAGE="http://www.seasip.info/Unix/LibDsk/" -SRC_URI="http://www.seasip.info/Unix/LibDsk/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc" - -src_install() { - emake DESTDIR="${D}" install - DOCS="doc/${PN}.txt doc/${PN}.pdf" einstalldocs -} diff --git a/app-emulation/libdsk/libdsk-1.5.5.ebuild b/app-emulation/libdsk/libdsk-1.5.5.ebuild new file mode 100644 index 000000000000..d7b91ae18fbb --- /dev/null +++ b/app-emulation/libdsk/libdsk-1.5.5.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="LIBDSK is a library for accessing discs and disc image files" +HOMEPAGE="http://www.seasip.info/Unix/LibDsk/" +SRC_URI="http://www.seasip.info/Unix/LibDsk/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +src_install() { + emake DESTDIR="${D}" install + DOCS="doc/${PN}.txt doc/${PN}.pdf" einstalldocs +} diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest index 6909b5615f97..8db2a125cb53 100644 --- a/app-emulation/libspectrum/Manifest +++ b/app-emulation/libspectrum/Manifest @@ -1,5 +1,5 @@ -DIST libspectrum-1.3.6.tar.gz 503554 BLAKE2B 99dcc6bde92ee955bc6f3801578d976ec58817fec2d958c36685d1e10c1c0b1171219e2143b95f6378f6f063aa8f071c650757fdea15dfa08fdb84f42efd0d45 SHA512 691d4525468396b48f9fd8580b2d93060816094bbb8f8d581b537a1028f1cfa9ceac24a3032008456a8d0dfc144d8b753bbf01c3358fb5fdc50534d232d84d58 DIST libspectrum-1.4.0.tar.gz 514972 BLAKE2B 698ada3d404db15d95946b8098d80b791c63548a6d09a442f926e4fb36b01e00ab8d9fea60b33edee688e02cf753fa37f91bd09a97090b152ac16e4d41d482f8 SHA512 4005133185bc677ac8c960fb3f731fa6dc29caa31e008ba59f1791626999717cb79e9be284d1534a3a3550fa2ea5f2b1616256f3deeac73853f5b8fe3031e3f3 -EBUILD libspectrum-1.3.6.ebuild 790 BLAKE2B 319b8ae423bf32068618e876405c94889150649f641f6ef1a6701a8fdd087ea99d83a25f16e17dd5a830c99972b82b2ed1abf666f48b53052dafef05ee3a3050 SHA512 8795b9d3a42652558a5943b7b944d911cbf9b90b30e22ab05f7006d0d111285b418c8c9ad9c2aa70fe38448b5ea158f72e2aada2d99931aed779e884358e85c5 +DIST libspectrum-1.4.1.tar.gz 516697 BLAKE2B 863030fabf37b03f15af389d8ab625f0f54c439153900e8b44bfefe2196fd576fbed9c23a6d2cfd7b07ca804a20329d8e646d3b7741ee1ded3d42246e36f203d SHA512 550d96c2432400a5b6ba86534acc0a2786dcdb9a8c847caf7768f1053cdbe0825d208128713a3f4b7fa42547bb3eac56329433a4c0a6753eec3ba9623eef5bf5 EBUILD libspectrum-1.4.0.ebuild 790 BLAKE2B 319b8ae423bf32068618e876405c94889150649f641f6ef1a6701a8fdd087ea99d83a25f16e17dd5a830c99972b82b2ed1abf666f48b53052dafef05ee3a3050 SHA512 8795b9d3a42652558a5943b7b944d911cbf9b90b30e22ab05f7006d0d111285b418c8c9ad9c2aa70fe38448b5ea158f72e2aada2d99931aed779e884358e85c5 +EBUILD libspectrum-1.4.1.ebuild 790 BLAKE2B 319b8ae423bf32068618e876405c94889150649f641f6ef1a6701a8fdd087ea99d83a25f16e17dd5a830c99972b82b2ed1abf666f48b53052dafef05ee3a3050 SHA512 8795b9d3a42652558a5943b7b944d911cbf9b90b30e22ab05f7006d0d111285b418c8c9ad9c2aa70fe38448b5ea158f72e2aada2d99931aed779e884358e85c5 MISC metadata.xml 941 BLAKE2B 7ac8ef35dfa24899f6990e5c92f5c2f70328575196308cd28f6dab967b9c39e73dabfea007c0cbf4a90bf73f5739d9c4a17b22cbe8c670b3a2d5531d47763520 SHA512 79cbe79daa7805ab944614d7d8370bc82e3ce6ecab7218112163ca118198bf176a1a06c87f8e24117f0a293d6dcc1cd0c02477e56655d66eb9b928c7ba7fabdc diff --git a/app-emulation/libspectrum/libspectrum-1.3.6.ebuild b/app-emulation/libspectrum/libspectrum-1.3.6.ebuild deleted file mode 100644 index 89d3021f9a99..000000000000 --- a/app-emulation/libspectrum/libspectrum-1.3.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Spectrum emulation library" -HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php" -SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="audiofile bzip2 gcrypt zlib" - -RDEPEND="dev-libs/glib:2 - audiofile? ( >=media-libs/audiofile-0.3.6 ) - bzip2? ( >=app-arch/bzip2-1.0 ) - gcrypt? ( dev-libs/libgcrypt:0 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - dev-lang/perl - virtual/pkgconfig" - -src_configure() { - econf \ - $(use_with audiofile libaudiofile) \ - $(use_with bzip2 bzip2) \ - $(use_with gcrypt libgcrypt) \ - $(use_with zlib zlib) -} - -src_install() { - default - dodoc doc/*.txt *.txt -} diff --git a/app-emulation/libspectrum/libspectrum-1.4.1.ebuild b/app-emulation/libspectrum/libspectrum-1.4.1.ebuild new file mode 100644 index 000000000000..89d3021f9a99 --- /dev/null +++ b/app-emulation/libspectrum/libspectrum-1.4.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Spectrum emulation library" +HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php" +SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="audiofile bzip2 gcrypt zlib" + +RDEPEND="dev-libs/glib:2 + audiofile? ( >=media-libs/audiofile-0.3.6 ) + bzip2? ( >=app-arch/bzip2-1.0 ) + gcrypt? ( dev-libs/libgcrypt:0 ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + dev-lang/perl + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_with audiofile libaudiofile) \ + $(use_with bzip2 bzip2) \ + $(use_with gcrypt libgcrypt) \ + $(use_with zlib zlib) +} + +src_install() { + default + dodoc doc/*.txt *.txt +} diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 275d1e3a9f8d..befbc0e5a641 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -16,7 +16,7 @@ AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b09 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 DIST libvirt-3.10.0.tar.xz 14952220 BLAKE2B 6af2f4c07dc71d8aa283460640d3fdeccd78616d1678da1decf6b1702984ca0c685d8074963e55a2776ac834e18dbb61d86c20c6032320bf9aa6e02b480526dd SHA512 c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260 DIST libvirt-3.8.0.tar.xz 14868712 BLAKE2B 4d97a03c3fe4eadb6d6eb3548231527c7d1a95e2134e63af63e72dcff8fd8d1cc8b5332f03d60edc2b200037ec0276b69a38c3379ce830a595bb5e83c3507e6f SHA512 fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672 -EBUILD libvirt-3.10.0.ebuild 9653 BLAKE2B 8c04f349e75ac75b3ea98e888337ffd265c60554ea716d6485f6b1bb2c6283713f6f39dab8c8501a073cdcf4c884f0864d2c339309057937ffaa92204bae7490 SHA512 07fe59fefae161f64859c3a33de270a04a3edec02438ce9b38c609a60b3412cb34e47a3b1631680d28a0c7ae4b81d9258da382aad823493759d10ea3a6d1748b +EBUILD libvirt-3.10.0-r1.ebuild 9623 BLAKE2B 3f6f5c5b00811cdaf1c3de74f6767960811b185f40799b74ad54eafd40b984e16dc80781b09c693f268c26e09aef322d68079a2c768f8a69264240e131100da6 SHA512 bac17a99509ad580929830016c55fa7efa8a1db24890ab07ff2a135bb0820724ca96d7c7e64fada39d9b8bb8b7088c399db9db3820fed6a9a9ec2c1be263d895 EBUILD libvirt-3.8.0-r1.ebuild 9661 BLAKE2B d6afc9ed4f228d62466d825c02e0ff24595c70ee98d5f62c0fe78ec846964ac6de99e6d2de4cd297804da13699afb21f1bd1400917ead16da3fbfa8cdce7c2a9 SHA512 66a28a319d1ed7263524c9c13e4331c3451ad321ccb39b4e608e05ad1e9d40fd1b4a75a05d5910a0a83c3bc47f8c5746aa80eedd16b1c0e8b0a4a4e093d79169 EBUILD libvirt-9999.ebuild 9506 BLAKE2B a9946fd7e60606b808d63b072cbf35cfbf141b2d1b10857c4cdc638127ed940e836bcc99641230588d4f7e00b320ea80c6efc5b4c9b9944ea360ed250a9abe2e SHA512 669472ae963372efc043f20dcf3a38d06fcdf45eb80ca13c7b76e6fed35590255206731ebd4a42b95017399bba309d49e734c14c07c9b5dc22cc7ae7819dbac2 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed diff --git a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild new file mode 100644 index 000000000000..cfdcbb6c9942 --- /dev/null +++ b/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild @@ -0,0 +1,382 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils user linux-info systemd readme.gentoo-r1 + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://libvirt.org/libvirt.git" + SRC_URI="" + KEYWORDS="" + SLOT="0" +else + # Versions with 4 numbers are stable updates: + if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then + SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" + else + SRC_URI="http://libvirt.org/sources/${P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm64 ~x86" + SLOT="0/${PV}" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="http://www.libvirt.org/" +LICENSE="LGPL-2.1" +IUSE=" + apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm + libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit + +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network + wireshark-plugins xen zeroconf zfs +" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + policykit? ( dbus ) + qemu? ( libvirtd ) + uml? ( libvirtd ) + vepa? ( macvtap ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +# gettext.sh command is used by the libvirt command wrappers, and it's +# non-optional, so put it into RDEPEND. +# We can use both libnl:1.1 and libnl:3, but if you have both installed, the +# package will use 3 by default. Since we don't have slot pinning in an API, +# we must go with the most recent +RDEPEND=" + app-misc/scrub + dev-libs/libgcrypt:0 + dev-libs/libnl:3 + >=dev-libs/libxml2-2.7.6 + || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) + >=net-libs/gnutls-1.0.25:0= + net-libs/libssh2 + net-libs/libtirpc + net-libs/rpcsvc-proto + >=net-misc/curl-7.18.0 + sys-apps/dmidecode + >=sys-apps/util-linux-2.17 + sys-devel/gettext + sys-libs/ncurses:0= + sys-libs/readline:= + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dbus? ( sys-apps/dbus ) + firewalld? ( net-firewall/firewalld ) + fuse? ( >=sys-fs/fuse-2.8.6:= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( sys-block/open-iscsi ) + libssh? ( net-libs/libssh ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + nfs? ( net-fs/nfs-utils ) + numa? ( + >sys-process/numactl-2.0.2 + sys-process/numad + ) + parted? ( + >=sys-block/parted-1.8[device-mapper] + sys-fs/lvm2[-device-mapper-only(-)] + ) + pcap? ( >=net-libs/libpcap-1.0.0 ) + policykit? ( >=sys-auth/polkit-0.9 ) + qemu? ( + >=app-emulation/qemu-0.13.0 + dev-libs/yajl + ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl ) + selinux? ( >=sys-libs/libselinux-2.0.85 ) + virt-network? ( + net-dns/dnsmasq[script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) + wireshark-plugins? ( net-analyzer/wireshark:= ) + xen? ( + app-emulation/xen + app-emulation/xen-tools:= + ) + udev? ( + virtual/udev + >=x11-libs/libpciaccess-0.10.9 + ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + zfs? ( sys-fs/zfs )" + +DEPEND="${RDEPEND} + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch + "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-3.10.0-fix_paths_for_apparmor.patch + "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch + "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 +) + +pkg_setup() { + if use qemu; then + enewgroup qemu 77 + enewuser qemu 77 -1 -1 "qemu,kvm" + fi + + use policykit && enewgroup libvirt + + # Check kernel configuration: + CONFIG_CHECK="" + use fuse && CONFIG_CHECK+=" + ~FUSE_FS" + + use lvm && CONFIG_CHECK+=" + ~BLK_DEV_DM + ~DM_MULTIPATH + ~DM_SNAPSHOT" + + use lxc && CONFIG_CHECK+=" + ~BLK_CGROUP + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + ~CGROUP_NET_PRIO + ~CGROUP_PERF + ~CGROUPS + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + ~NAMESPACES + ~NET_CLS_CGROUP + ~NET_NS + ~PID_NS + ~POSIX_MQUEUE + ~SECURITYFS + ~USER_NS + ~UTS_NS + ~VETH + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS" + + kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES" + + use macvtap && CONFIG_CHECK+=" + ~MACVTAP" + + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM" + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + # Handle specific kernel versions for different features + kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" + if kernel_is ge 3 6; then + CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " + kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " + fi + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi +} + +src_prepare() { + touch "${S}/.mailmap" + + default + + if [[ ${PV} = *9999* ]]; then + # git checkouts require bootstrapping to create the configure script. + # Additionally the submodules must be cloned to the right locations + # bug #377279 + ./bootstrap || die "bootstrap failed" + ( + git submodule status | sed 's/^[ +-]//;s/ .*//' + git hash-object bootstrap.conf + ) >.git-module-status + fi + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ + -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ + -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with apparmor) + $(use_with apparmor apparmor-profiles) + $(use_with audit) + $(use_with caps capng) + $(use_with dbus) + $(use_with firewalld) + $(use_with fuse) + $(use_with glusterfs) + $(use_with glusterfs storage-gluster) + $(use_with iscsi storage-iscsi) + $(use_with libvirtd) + $(use_with libssh) + $(use_with lvm storage-lvm) + $(use_with lvm storage-mpath) + $(use_with lxc) + $(use_with macvtap) + $(use_enable nls) + $(use_with numa numactl) + $(use_with numa numad) + $(use_with openvz) + $(use_with parted storage-disk) + $(use_with pcap libpcap) + $(use_with phyp) + $(use_with policykit polkit) + $(use_with qemu) + $(use_with qemu yajl) + $(use_with rbd storage-rbd) + $(use_with sasl) + $(use_with selinux) + $(use_with udev) + $(use_with uml) + $(use_with vepa virtualport) + $(use_with virt-network network) + $(use_with wireshark-plugins wireshark-dissector) + $(use_with xen) + $(use_with xen xen-inotify) + $(use_with xen libxl) + $(use_with zeroconf avahi) + $(use_with zfs storage-zfs) + + --without-hal + --without-netcf + --without-sanlock + --without-xenapi + + --with-esx + --with-init-script=systemd + --with-qemu-group=$(usex caps qemu root) + --with-qemu-user=$(usex caps qemu root) + --with-remote + --with-storage-fs + --with-vmware + + --disable-static + --disable-werror + + --with-html-subdir=${PF}/html + --localstatedir=/var + ) + + if use virtualbox && has_version app-emulation/virtualbox-ose; then + myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) + else + myeconfargs+=( $(use_with virtualbox vbox) ) + fi + + econf "${myeconfargs[@]}" + + if [[ ${PV} = *9999* ]]; then + # Restore gnulib's config.sub and config.guess + # bug #377279 + (cd .gnulib && git reset --hard > /dev/null) + fi +} + +src_test() { + cd "${BUILD_DIR}" + + # remove problematic tests, bug #591416, bug #591418 + sed -i -e 's#commandtest$(EXEEXT) # #' \ + -e 's#virfirewalltest$(EXEEXT) # #' \ + -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ + -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ + tests/Makefile + + export VIR_TEST_DEBUG=1 + HOME="${T}" emake check || die "tests failed" +} + +src_install() { + emake DESTDIR="${D}" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install + + find "${D}" -name '*.la' -delete || die + + # Remove bogus, empty directories. They are either not used, or + # libvirtd is able to create them on demand + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var/cache + rm -rf "${D}"/var/run + rm -rf "${D}"/var/log + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + systemd_install_serviced \ + "${FILESDIR}"/libvirtd.service.conf libvirtd.service + + systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd || die + newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_preinst() { + # we only ever want to generate this once + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml + fi +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-3.10.0.ebuild b/app-emulation/libvirt/libvirt-3.10.0.ebuild deleted file mode 100644 index c8d9893516a7..000000000000 --- a/app-emulation/libvirt/libvirt-3.10.0.ebuild +++ /dev/null @@ -1,382 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils user linux-info systemd readme.gentoo-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" - SRC_URI="" - KEYWORDS="" - SLOT="0" -else - # Versions with 4 numbers are stable updates: - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz" - else - SRC_URI="http://libvirt.org/sources/${P}.tar.xz" - fi - KEYWORDS="~amd64 ~arm64 ~x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm - libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit - +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network - wireshark-plugins xen zeroconf zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - uml? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - || ( sys-libs/glibc[rpc(-)] net-libs/rpcsvc-proto ) - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - firewalld? ( net-firewall/firewalld ) - fuse? ( >=sys-fs/fuse-2.8.6:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-0.13.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - app-emulation/xen - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - zfs? ( sys-fs/zfs )" - -DEPEND="${RDEPEND} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-3.10.0-fix_paths_for_apparmor.patch - "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch - "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488 -) - -pkg_setup() { - if use qemu; then - enewgroup qemu 77 - enewuser qemu 77 -1 -1 "qemu,kvm" - fi - - use policykit && enewgroup libvirt - - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - default - - if [[ ${PV} = *9999* ]]; then - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf - ) >.git-module-status - fi - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with caps capng) - $(use_with dbus) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with libvirtd) - $(use_with libssh) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with phyp) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with udev) - $(use_with uml) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen) - $(use_with xen xen-inotify) - $(use_with xen libxl) - $(use_with zeroconf avahi) - $(use_with zfs storage-zfs) - - --without-hal - --without-netcf - --without-sanlock - --without-xenapi - - --with-esx - --with-init-script=systemd - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --with-html-subdir=${PF}/html - --localstatedir=/var - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - econf "${myeconfargs[@]}" - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) - fi -} - -src_test() { - cd "${BUILD_DIR}" - - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" -} - -src_install() { - emake DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var/cache - rm -rf "${D}"/var/run - rm -rf "${D}"/var/log - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index fcfa84f6036e..4c75a6b92f6a 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -1,9 +1,6 @@ +AUX lxc-1.0.11-bash-completion.patch 924 BLAKE2B 0f74fc4c1c828957ab74ad4f6267f431c75e851f2b268e75f6af79b235e9a183880c36d7711a3ffec364d1a879832ec92bcd4b7d6f0e7a617fb206716501703a SHA512 81373ef5f6db4a54669be803aa04a1ea30187313b5419a86636a65e31147b1eaeaf77438d51c5359bdf8fed4eda6e46e938e20ce3a1d6ff2285777892e275675 +AUX lxc-1.0.11-major.patch 1410 BLAKE2B b65a9878986d438720743ae984ec6b2f989b95c80acad846a3da6a3252a1092679a6a71a1f287e5aea19387f536cd76b2aaca5f00a18488ea52329d385aa2c1f SHA512 0374a75e8e34459fa3be379346af1615c753629d5c10048c6dbef8d935df89bc4f32bb042d1071924e20f31402bb2de19dc2b1d6a961d1927ea3072fc91c429f AUX lxc-1.0.8-bash-completion.patch 1324 BLAKE2B db46fa3943f4006b7dda9fabe7ff33d507a26cf742ff40bfc183aef182521d770c600bf107e828ab0c7a8ff7d4c2f8db7aaaf87e996529c1d4c9098cc122383b SHA512 0d6293efa1080b568f8f2d64f41406ae6f07109eeb80e3d2a509246fa145c70c4128c4b8c38347b5b7e9bb0a69e2cc11f0c4e8e3ac2b6f74b57836216e5290db -AUX lxc-2.0.3-bash-completion.patch 1221 BLAKE2B d5503b036413af015a13d4e82d072431a601adf51e7449d920149438f8a18e510075e10824d61583b93d69cdb4f888f64f77d16f86764fecded259bf2f3de35f SHA512 8380c1fecef8e158cc076bf9dc7556e855c202a246ae062168055b45b1ecd893ef7f188e7a784605dfe7963817a8e33fe7fc7d836b72757c913215aa06c750d0 -AUX lxc-2.0.3-omit-sysconfig.patch 285 BLAKE2B 6ead4949a77b208ae3fc77dd03e93ca7443587f3c44a593d5986cf26c60d31431430987cb3647c264c29de4e7c0e0e828dd2f9b3d301c4bc2227a81f1cc444f3 SHA512 3fac46c73a8c3c542d5f94b4d2e39d4c240f598090927a042d1dfbeac887444a905c7bba8fd03d58dd5436a4ef4d109c45c33e1a8917e9ec1d24f1ca7240549f -AUX lxc-2.0.4-bash-completion.patch 1169 BLAKE2B d188a25853ccd7151ace918ac648427d623b6d01eef6e8c043df7decd9759e6025774e564432aa16fcdd1199c358c5d9cbaaf2055ab40751db2034a767e1de58 SHA512 02f875c1f04e973f79b0b963999526e4a689e6e0e2eae5d652445b130a943b6f181ee5f4389f7fc91f0109da236419b661437e9f2e8e5144a1ae23216f09b820 -AUX lxc-2.0.4-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7 -AUX lxc-2.0.5-bash-completion.patch 1169 BLAKE2B d188a25853ccd7151ace918ac648427d623b6d01eef6e8c043df7decd9759e6025774e564432aa16fcdd1199c358c5d9cbaaf2055ab40751db2034a767e1de58 SHA512 02f875c1f04e973f79b0b963999526e4a689e6e0e2eae5d652445b130a943b6f181ee5f4389f7fc91f0109da236419b661437e9f2e8e5144a1ae23216f09b820 AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64ab4286b4440af1582086a0ced8c6568efb470ccf68786da6ea52c82d1f4e81feac45bec411febc04fc31d108f05ccde2 SHA512 0aed9aca687accc6df79e97f48ab333043256e8ae68c8643f2b2452cc8013191238867d64ec71f7d399c59a43d3ba698b35d965090c5cb149b4f41302432e6e7 AUX lxc-2.0.6-bash-completion.patch 919 BLAKE2B a364398ad6fe44213ba1097e961813d4cbc71efbaf25f90a44201dc95151b7676dbe1c086b3a34fb38ffb9ef2a5ebb25f9885e809c11ec1b1e9a6516f48a3ae1 SHA512 caa90c8bad2a79b4e42b781f00d6f2a7be37fc5c5301592b026c88db2652c90871be940c86a9156f03bc186f76cf2068a2d3084e9abc7a5896ea081885085d41 AUX lxc-2.0.6-major.patch 1834 BLAKE2B 6793238e1d96ac5c4f802fa845ec42a6e2c9baf0215bd55fb2f7aea27571ffdc75ce435e9a7702a92350f78e19fb8af58a03ed76bbd30cf894681dac4d51c9a0 SHA512 274e2d138e32645aca2ab954e24db02c4d7c5750a781ebf3d81c69c7eeade06b33a3c8ac36a16548a58f6d7f518977fb2df09e22de96d966de542f470720b398 @@ -11,18 +8,12 @@ AUX lxc.initd.3 3273 BLAKE2B fe7c2b24ef6758bf3f615be36de49246cb99e1d0e073d484f7a AUX lxc.initd.5 3282 BLAKE2B 29dbc1177ee9afe203cad36b62f4dd76df76946f1b647fdbff87d5ba840ffc62594f2bf2488b90600625a463dc17642e8853580a15b5cc8399d49d25faccca73 SHA512 6f72701fa42d41b39647a95ec45ca4d669a08a300f54b39715bbb554001bf662b9173cdacc2cb49b8e1093f5fcef971a1fd8270164c73a8e49d1b66dcbe7408d AUX lxc_at.service 232 BLAKE2B 12dd7142330cbaeda69d5f4c6ef14dae6ab435d2668e4a3279d8d54dac05f54a877afdc1705aa5a18db1855d6bcf68518f86431aa5105058598e97604fe00133 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3 +DIST lxc-1.0.11.tar.gz 850645 BLAKE2B 1a8eff91d970d3160d5ca7338f4e4d68c722a277a804396e7c30b34dbf4aeccc0609982940bb660992880078167cdf3382a55af404b3e52ebe8cd8af104b1efc SHA512 5537e61a286cfce3c763b81eec625538c796ea1e8f5e94c5a28fc8964762c8c0efa7983a188d521bf3420a42569d7124e6587950bc90b79583fa42cc8e2f8f74 DIST lxc-1.0.8.tar.gz 575127 BLAKE2B 246ac7a2b4306c52a741b2f763bcc81d9999fb27942ef93d6a786ed2ea010c646f5a2388407d26425387b8a819cacae927c8512995bf19b11d610e1887ea6470 SHA512 f552a4f48bb47d26c6b9ddaf8221a439c0848e3f54ec41b77d54717c21bddd56193941046cc96c699790e8265e762a926469c25ee687adcf7795f2906b1c260a -DIST lxc-2.0.3.tar.gz 772448 BLAKE2B 2336edea328a0ac033f2183386a2907ee8a088032b089c073ae8bbce6f54c55788288be85fe35a0b547976d5868abc31b27ffe5a5049e8769350c2b48dd9310c SHA512 df714f189ec7aa681710fbd58405b8958740102032c0130d8a0eaaae0341a9bc91a215136203c404ad79773800f620bf6f71f811b3effe559aed66efa4f34fef -DIST lxc-2.0.4.tar.gz 775634 BLAKE2B 9699ae598c3dfddf458f62ca154a4ec75c3510d8dc0be98ebb6b10a30b21ec5e56ff9ec20615c0104a92124c4833e9439f88d04e0312a7c82f79ed7b6f802bbd SHA512 3f985bba5aaa8a70f0329316ea4f42ab135d58c47611154c62e103718212a4b2c5e4f25fd45c372424db1fbf40afdc8269ae98655fb3bc8e31085a5d948f702b -DIST lxc-2.0.5.tar.gz 778842 BLAKE2B 02015ece79c2d0f3d0028b004c56042e12d40993ac0fff3c56c747de542debb33c32256d66d266fa99b4263fecaa8bb77c5cc48dbf6e9ca322f87613c2099821 SHA512 8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f -DIST lxc-2.0.6.tar.gz 788483 BLAKE2B 2b147f1699ad8cef9f7cae6e674af072fd92b017e94567dc8d50fad00a6ba75562dfd984b85d1b648aec059533a378b2212fef4be70941dfa3bd69ec1f53fb13 SHA512 f44c0498876462d78e57d19816eab666e90470badc2bbd38fed9f504e8b21c3e68e4d0f63a8676fa8716be60481befb3db44098228fd71b480972af2b5dcf1e3 DIST lxc-2.0.7.tar.gz 792557 BLAKE2B e5f1e6d8961938200e116527fab8ce341cf285826afdccac88f4bae65ffd649a406dac7555024557f38c4b415a59cd3b5fb255f1dbf015ce01d4975bed3b1c80 SHA512 eb48dc800ce43d2f4d46e0cecc4d0a714b3e22c6a4975776b54d17d1d20d5a1411e6b605215282f1f77286ddf22b61c80b86b83752191fc18023894ef7a1c44d DIST lxc-2.0.8.tar.gz 1308705 BLAKE2B 044e82e182f4ca325da237b888ff16b0469eb11ecdab2ed55f5e9372e84d816ec30edee28ef1473aaa7211a9d9aee0d26f45f169320551e45098da9de7a74104 SHA512 ed9fd47e92007f433695cffea659180866a5ac2778712f4eb13b6629bb18292589f5b674b734853ca196ba1f6d38bdbf3cc8a2bb28e25d3540b06b945fcf9096 +EBUILD lxc-1.0.11.ebuild 5899 BLAKE2B 015dd027c8ac9e51f7f93a0fe6e82ac661229291794f15b6cac3d8d4e740988ff3ef3ae1c92ab621bd7a8a714a3a0f67d5278178d7b966536153d4f12d7eb424 SHA512 cd21008f2532dd23b9ecb79646cc87691d86417325d2511f42503c8c8e2b49bd5bfb62811d3267b30abf371233a4a5580fa81d4e1e3f677aa2c32ddd6d69f906 EBUILD lxc-1.0.8.ebuild 5932 BLAKE2B f8f4843c5da5405e69ebee0b3c5e1d50057d15baa841f4b20edf8acc22cc6f761d1723fe1f9cac93b4129ce10ab5eec0c52c44172dd724f0f2c65d24e293e7e1 SHA512 6af1e114ecc64264eafb85e77fba744e4b8dfdf19c8d2b769959d642df237e29813f71bcf370ea75685cb728592c6b9f9a9637d0b4b00f13d40ee8c110045619 -EBUILD lxc-2.0.3-r1.ebuild 6246 BLAKE2B e3b9c5b4708228ad4dd42cefe893676fe19aba7e77b022b0a537dd90112dd76a079acfcc3c006ce3765d0b86b752f909a9ef23ef4fc4f5efc2fb92481a66d7c9 SHA512 8886a1d54e42367ed32aecd4e151dd46edea205a4ff6734dcfddc7d4029bba0ae22978aeded5e76e22f709660b45c15fedf7b498536b8c9e090ee0359f860eaf -EBUILD lxc-2.0.4.ebuild 6309 BLAKE2B adab18812c6c6eda050c3b59e52219ee0b4a6295578ea36ceb91edf1e0aa4efbbc76659627b008229a22e70324fc666b07625748266de32cb59e215f91943db5 SHA512 c4ebc644ac33bd976308b191f6fbad170872056879071562bae1e80e8082f0882e942d2757207aafce1ebdb1c7d8d8cee3f45339b5be6d205421541fef9594de -EBUILD lxc-2.0.5.ebuild 6309 BLAKE2B adab18812c6c6eda050c3b59e52219ee0b4a6295578ea36ceb91edf1e0aa4efbbc76659627b008229a22e70324fc666b07625748266de32cb59e215f91943db5 SHA512 c4ebc644ac33bd976308b191f6fbad170872056879071562bae1e80e8082f0882e942d2757207aafce1ebdb1c7d8d8cee3f45339b5be6d205421541fef9594de -EBUILD lxc-2.0.6-r1.ebuild 6362 BLAKE2B 0746685a33f6fd7f96ede01e0e945f33e4c12b08ec45b2f5a1de843aea11cce595f4f3baca2bb80b8cd0bfb758eeee8d1d9f8f612714a33c3fc7ecb5253fb169 SHA512 57ed76595bfe00f8a924793832ea5b8ab4c08b68d978b91343cb43f0299b06a10baa0e65766b37a4a9dcb432cfc6cd1da93d8abd526967ccc5cf40693f748cf8 EBUILD lxc-2.0.7.ebuild 6343 BLAKE2B 9b93d611f9ab364779579bbab92b0e11245f2df2bce41e2c0aa87dc3886278eda9d41466c8922cbc587bbb34933341e6afd26ed675df1571504629d2176c1814 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f EBUILD lxc-2.0.8.ebuild 6429 BLAKE2B ef98b1c497187a3fad6e991b6d6b356d6a2cfa9b32ec18324a9be28c54c8a5e19dad8cf143a47d8a7f9d261a96e4dbfee1a1b5b604fa71e82195edddda7339d1 SHA512 173af6b3482067cd483865eb0080a78bea4b9662c540a4c6f6614c20d886ca2eae961ad63024c86d7156703b04c976a30d9095844361c549cd0ebff3edfacebd MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2 diff --git a/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch b/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch new file mode 100644 index 000000000000..d8d0bac55a76 --- /dev/null +++ b/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch @@ -0,0 +1,27 @@ +diff --git a/config/bash/lxc.in b/config/bash/lxc.in +index 344d5cb2..f051eaae 100644 +--- a/config/bash/lxc.in ++++ b/config/bash/lxc.in +@@ -1,4 +1,3 @@ +-_have lxc-start && { + _lxc_names() { + COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) + } +@@ -100,4 +99,3 @@ _have lxc-start && { + + complete -o default -F _lxc_generic_o lxc-clone + complete -o default -F _lxc_generic_o lxc-start-ephemeral +-} +diff --git a/configure.ac b/configure.ac +index 2ea88c19..f52d772a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -429,7 +429,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) + AM_COND_IF([ENABLE_BASH], + [AC_MSG_CHECKING([bash completion directory]) + PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , +- bashcompdir="${sysconfdir}/bash_completion.d") ++ bashcompdir="$datadir/bash-completion/completions") + AC_MSG_RESULT([$bashcompdir]) + AC_SUBST(bashcompdir) + ]) diff --git a/app-emulation/lxc/files/lxc-1.0.11-major.patch b/app-emulation/lxc/files/lxc-1.0.11-major.patch new file mode 100644 index 000000000000..8a3c2b2bd6d3 --- /dev/null +++ b/app-emulation/lxc/files/lxc-1.0.11-major.patch @@ -0,0 +1,64 @@ +diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c +index 59eda7e4..44b71d4c 100644 +--- a/src/lxc/bdev.c ++++ b/src/lxc/bdev.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include "lxc.h" + #include "config.h" +@@ -58,9 +59,6 @@ + #ifdef MAJOR_IN_MKDEV + # include + #endif +-#ifdef MAJOR_IN_SYSMACROS +-# include +-#endif + + #ifndef BLKGETSIZE64 + #define BLKGETSIZE64 _IOR(0x12,114,size_t) +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index 5d583d5f..d4217c27 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -36,14 +36,12 @@ + #include + #include + #include ++#include + + /* makedev() */ + #ifdef MAJOR_IN_MKDEV + # include + #endif +-#ifdef MAJOR_IN_SYSMACROS +-# include +-#endif + + #ifdef HAVE_STATVFS + #include +diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c +index 3963a3ee..30ac6733 100644 +--- a/src/lxc/lxccontainer.c ++++ b/src/lxc/lxccontainer.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -60,9 +61,6 @@ + #ifdef MAJOR_IN_MKDEV + # include + #endif +-#ifdef MAJOR_IN_SYSMACROS +-# include +-#endif + + #if HAVE_IFADDRS_H + #include diff --git a/app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch deleted file mode 100644 index 9ef6013e5b6f..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- lxc-lxc-2.0.1/config/bash/Makefile.am.orig 2016-05-18 20:40:42.238487678 +0000 -+++ lxc-lxc-2.0.1/config/bash/Makefile.am 2016-05-18 20:43:02.163497779 +0000 -@@ -2,12 +2,12 @@ - - if ENABLE_BASH - install-bash: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ -- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/ -+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/ -+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/ - - uninstall-bash: -- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc -- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || : -+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc -+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/completions/ || : - - install-data-local: install-bash - uninstall-local: uninstall-bash ---- lxc-lxc-2.0.1/config/bash/lxc.in.orig 2016-05-18 20:40:51.079488316 +0000 -+++ lxc-lxc-2.0.1/config/bash/lxc.in 2016-05-18 20:45:03.506506538 +0000 -@@ -1,4 +1,3 @@ --_have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -100,4 +99,3 @@ - - complete -o default -F _lxc_generic_o lxc-copy - complete -o default -F _lxc_generic_o lxc-start-ephemeral --} diff --git a/app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch deleted file mode 100644 index 9b83a3b2687c..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- lxc-lxc-2.0.1/config/Makefile.am.orig 2016-05-19 02:56:11.891113982 +0000 -+++ lxc-lxc-2.0.1/config/Makefile.am 2016-05-19 02:56:32.596115476 +0000 -@@ -1 +1 @@ --SUBDIRS = apparmor bash etc init selinux templates yum sysconfig -+SUBDIRS = apparmor bash etc init selinux templates yum diff --git a/app-emulation/lxc/files/lxc-2.0.4-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.4-bash-completion.patch deleted file mode 100644 index 6feb4c2bb01c..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.4-bash-completion.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /config/bash/Makefile.am.orig 2016-05-18 20:40:42.238487678 +0000 -+++ /config/bash/Makefile.am 2016-05-18 20:43:02.163497779 +0000 -@@ -2,12 +2,12 @@ - - if ENABLE_BASH - install-bash: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ -- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/ -+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/ -+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/ - - uninstall-bash: -- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc -- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || : -+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc -+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/completions/ || : - - install-data-local: install-bash - uninstall-local: uninstall-bash ---- /config/bash/lxc.in.orig 2016-05-18 20:40:51.079488316 +0000 -+++ /config/bash/lxc.in 2016-05-18 20:45:03.506506538 +0000 -@@ -1,4 +1,3 @@ --_have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -100,4 +99,3 @@ - - complete -o default -F _lxc_generic_o lxc-copy - complete -o default -F _lxc_generic_o lxc-start-ephemeral --} diff --git a/app-emulation/lxc/files/lxc-2.0.4-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.4-omit-sysconfig.patch deleted file mode 100644 index 3ec81356499e..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.4-omit-sysconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- /config/Makefile.am.orig 2016-05-19 02:56:11.891113982 +0000 -+++ /config/Makefile.am 2016-05-19 02:56:32.596115476 +0000 -@@ -1 +1 @@ --SUBDIRS = apparmor bash etc init selinux templates yum sysconfig -+SUBDIRS = apparmor bash etc init selinux templates yum diff --git a/app-emulation/lxc/files/lxc-2.0.5-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.5-bash-completion.patch deleted file mode 100644 index 6feb4c2bb01c..000000000000 --- a/app-emulation/lxc/files/lxc-2.0.5-bash-completion.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- /config/bash/Makefile.am.orig 2016-05-18 20:40:42.238487678 +0000 -+++ /config/bash/Makefile.am 2016-05-18 20:43:02.163497779 +0000 -@@ -2,12 +2,12 @@ - - if ENABLE_BASH - install-bash: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ -- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/ -+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/ -+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/ - - uninstall-bash: -- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc -- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || : -+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc -+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/completions/ || : - - install-data-local: install-bash - uninstall-local: uninstall-bash ---- /config/bash/lxc.in.orig 2016-05-18 20:40:51.079488316 +0000 -+++ /config/bash/lxc.in 2016-05-18 20:45:03.506506538 +0000 -@@ -1,4 +1,3 @@ --_have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -100,4 +99,3 @@ - - complete -o default -F _lxc_generic_o lxc-copy - complete -o default -F _lxc_generic_o lxc-start-ephemeral --} diff --git a/app-emulation/lxc/lxc-1.0.11.ebuild b/app-emulation/lxc/lxc-1.0.11.ebuild new file mode 100644 index 000000000000..2658e3a05db4 --- /dev/null +++ b/app-emulation/lxc/lxc-1.0.11.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PYTHON_COMPAT=( python3_{4,5,6} ) +DISTUTILS_OPTIONAL=1 + +inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd + +DESCRIPTION="LinuX Containers userspace utilities" +HOMEPAGE="https://linuxcontainers.org/" +SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="doc examples lua python seccomp" + +RDEPEND="net-libs/gnutls + sys-libs/libcap + lua? ( >=dev-lang/lua-5.1:= ) + python? ( ${PYTHON_DEPS} ) + seccomp? ( sys-libs/libseccomp )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-sgml-utils ) + >=sys-kernel/linux-headers-3.2" + +RDEPEND="${RDEPEND} + sys-apps/util-linux + app-misc/pax-utils + virtual/awk" + +CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE + ~CPUSETS ~CGROUP_CPUACCT + ~CGROUP_SCHED + + ~NAMESPACES + ~IPC_NS ~USER_NS ~PID_NS + + ~CGROUP_FREEZER + ~UTS_NS ~NET_NS + ~VETH ~MACVLAN + + ~POSIX_MQUEUE + ~!NETPRIO_CGROUP + + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS + ~!GRKERNSEC_PROC +" + +ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" + +ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" + +ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" +ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" + +ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" +ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" + +ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" + +ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." + +ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" + +DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +src_prepare() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + if [[ -n ${BACKPORTS} ]]; then + epatch "${WORKDIR}"/patches/* + fi + + epatch "${FILESDIR}"/${PN}-1.0.11-bash-completion.patch + epatch "${FILESDIR}"/${PN}-1.0.11-major.patch + + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + econf \ + --localstatedir=/var \ + --bindir=/usr/sbin \ + --docdir=/usr/share/doc/${PF} \ + --with-config-path=/etc/lxc \ + --with-rootfs-path=/usr/lib/lxc/rootfs \ + --with-distro=gentoo \ + $(use_enable doc) \ + --disable-apparmor \ + $(use_enable examples) \ + $(use_enable lua) \ + $(use_enable seccomp) \ + --disable-python +} + +python_compile() { + distutils-r1_python_compile build_ext -I ../ -L ../${PN} +} + +src_compile() { + default + + if use python; then + pushd "${S}/src/python-${PN}" > /dev/null + distutils-r1_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die + bashcomp_alias ${PN}-start \ + ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} + + if use python; then + pushd "${S}/src/python-lxc" > /dev/null + # Unset DOCS. This has been handled by the default target + unset DOCS + distutils-r1_src_install + popd > /dev/null + fi + + keepdir /etc/lxc /usr/lib/lxc/rootfs /var/log/lxc + + find "${D}" -name '*.la' -delete + + # Gentoo-specific additions! + # Use initd.3 per #517144 + newinitd "${FILESDIR}/${PN}.initd.3" ${PN} + + # lxc-devsetup script + exeinto /usr/libexec/${PN} + doexe config/init/systemd/${PN}-devsetup + # Use that script with the systemd service (Similar to upstream + # Makefile.am + cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die + sed -i \ + "/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \ + ${PN}_at.service \ + || die "Failed to add ${PN}-devsetup to the systemd service file" + systemd_newunit ${PN}_at.service "lxc@.service" +} + +pkg_postinst() { + elog "There is an init script provided with the package now; no documentation" + elog "is currently available though, so please check out /etc/init.d/lxc ." + elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" + elog "to start the container defined into /etc/lxc/configname.conf ." + elog "For further information about LXC development see" + elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available + elog "" + ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2" + ewarn "and previous versions. This means you'll have to use syntax like the following" + ewarn "" + ewarn " lxc.rootfs = /container" + ewarn " lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0" + ewarn "" + ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you" + ewarn "will need sys-apps/yum or dev-util/debootstrap." + ewarn "" + ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to" + ewarn "work, while others will actually make it much more secure. Please refer to" + ewarn "Diego Elio Pettenò's weblog at http://blog.flameeyes.eu/tag/lxc for further" + ewarn "details." +} diff --git a/app-emulation/lxc/lxc-2.0.3-r1.ebuild b/app-emulation/lxc/lxc-2.0.3-r1.ebuild deleted file mode 100644 index fbf2ce71f6d3..000000000000 --- a/app-emulation/lxc/lxc-2.0.3-r1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_4,3_5} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~arm64" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_PROC - ~!GRKERNSEC_SYSFS_RESTRICT -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-bash-completion.patch - #558854 - epatch "${FILESDIR}"/${P}-omit-sysconfig.patch - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --docdir=/usr/share/doc/${PF} \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - # start-ephemeral is no longer a command but removing it here - # generates QA warnings (still in upstream completion script) - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - newinitd "${FILESDIR}/${PN}.initd.5" ${PN} - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} diff --git a/app-emulation/lxc/lxc-2.0.4.ebuild b/app-emulation/lxc/lxc-2.0.4.ebuild deleted file mode 100644 index 5cafe41f06e2..000000000000 --- a/app-emulation/lxc/lxc-2.0.4.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_4,3_5} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~arm64" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_PROC - ~!GRKERNSEC_SYSFS_RESTRICT -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES" - linux-info_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-bash-completion.patch - #558854 - eapply "${FILESDIR}"/${P}-omit-sysconfig.patch - eapply_user - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - # start-ephemeral is no longer a command but removing it here - # generates QA warnings (still in upstream completion script) - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - newinitd "${FILESDIR}/${PN}.initd.5" ${PN} - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} diff --git a/app-emulation/lxc/lxc-2.0.5.ebuild b/app-emulation/lxc/lxc-2.0.5.ebuild deleted file mode 100644 index 5cafe41f06e2..000000000000 --- a/app-emulation/lxc/lxc-2.0.5.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_4,3_5} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~arm64" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_PROC - ~!GRKERNSEC_SYSFS_RESTRICT -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES" - linux-info_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-bash-completion.patch - #558854 - eapply "${FILESDIR}"/${P}-omit-sysconfig.patch - eapply_user - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - # start-ephemeral is no longer a command but removing it here - # generates QA warnings (still in upstream completion script) - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - newinitd "${FILESDIR}/${PN}.initd.5" ${PN} - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} diff --git a/app-emulation/lxc/lxc-2.0.6-r1.ebuild b/app-emulation/lxc/lxc-2.0.6-r1.ebuild deleted file mode 100644 index c3ca8d9ee12c..000000000000 --- a/app-emulation/lxc/lxc-2.0.6-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_4,3_5} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~arm64" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS - ~!GRKERNSEC_PROC - ~!GRKERNSEC_SYSFS_RESTRICT -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES" - linux-info_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-bash-completion.patch - #558854 - eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch - eapply "${FILESDIR}"/${PN}-2.0.6-major.patch - eapply_user - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - # start-ephemeral is no longer a command but removing it here - # generates QA warnings (still in upstream completion script) - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - newinitd "${FILESDIR}/${PN}.initd.5" ${PN} - - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest index 68682c28aa9b..716c7181ec8e 100644 --- a/app-emulation/playonlinux/Manifest +++ b/app-emulation/playonlinux/Manifest @@ -4,5 +4,5 @@ AUX playonlinux-4.2.6-stop-update-warning.patch 766 BLAKE2B 934a8600742d7030d22f AUX playonlinux-pkg.1 643 BLAKE2B 80c5381aad102d81eebaa81d3ed83ed0fb16aa29b7f4a2e2b9dd349fe020112fd34e32ac9edab510852cb66bc402d9ef46ed0a2aed5c3369885161797e47aca8 SHA512 115f87cee7c6d56dbc54da9b120ca468fb29ae4be116101cfa3e8efd1efd9a372e6e8424462087807f6755d496575c44788914f4e45c901359ce52fbe37210a8 AUX playonlinux.1 886 BLAKE2B 903f21600540798a765ae209832c4f111380340f4c6305ca333b29e6508579e13b3df8c3d44bc56284cdce290b319d40294eaee7476630190c9b7fd24ece2e76 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d DIST PlayOnLinux_4.2.12.tar.gz 3204230 BLAKE2B 80ef0e5763448da4a37263c64d408e8263771694666a7c704b5900dfe0e52cc18405c34d609d8c49a0d05a383fca2d035e956e3bbe9a9a0c92a4e43b319ed7ba SHA512 f4ededc8fe0117c66fd5672e136e19b9b48a41acdd3e1b1b3dd7fae2c354e77795f0a4f8286b09b7d1813363aee50fa0811c04c3194aaf745963a2e6115b3909 -EBUILD playonlinux-4.2.12.ebuild 2857 BLAKE2B 98df45863b2d518b149d8472ef61b2c5b8f8a9f80ddab2670ccad046ba1a28834d316431f765a5512771b3acf343aad072053dea51814d2c1e842d4e211e6f14 SHA512 c9479e61a5a344e07132d9c670bd2bd269147c35a22950689fb9603ca6c8813101285eca255a52aa59559af4402fab552bb7053696044c8efd212f21054583db +EBUILD playonlinux-4.2.12.ebuild 2857 BLAKE2B 01c447ec1c7fda53d3224e551929d7f1130242a0c61755ac547a59b978e35021a3f306d4e89c714691ef75f285d9b14555612c6b7ca97e3b1a5e582226fbc0ca SHA512 8958890afd86abafde4f11c383c434873f805b3a92d4af2e58598273c8e7abcf816afe08da21fb612330d27484de5244119a3cf79ff035a66763cf7cfa3f8e1a MISC metadata.xml 433 BLAKE2B 6ba322414d75d581231afedbb791ce71aff799da09be4e08aab6f4e7e2e88d19b6e8701e36599bd1760e7076558c733edfe19f603f7f9541d0197cf4f1d59e4a SHA512 1e1dbfa93723297b63288436eaa1ce87183de71847c0ce61767381f668f6ad0bf69119570f7c7e395866f15e176f7412378c09386f8ddb271f7b2ec39da2d295 diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild index 9d672b2952e2..2ab1ec1009fd 100644 --- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild +++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild @@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS} app-arch/p7zip app-arch/unzip app-crypt/gnupg - || ( app-emulation/wine virtual/wine ) + || ( virtual/wine app-emulation/wine ) dev-python/wxpython:3.0[${PYTHON_USEDEP}] net-misc/wget x11-apps/mesa-progs diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest index e6e8473e22a0..85222284e0a7 100644 --- a/app-emulation/spice-vdagent/Manifest +++ b/app-emulation/spice-vdagent/Manifest @@ -1,6 +1,5 @@ AUX spice-vdagent-0.17.0-add-missing-stub-function.patch 418 BLAKE2B f677282366e7f670f09f05a6057468f59579fcd3086e712b4bcd006eb0dcee6a61712323bef216fc09212b0bc245eb570ecce68f1f62e6c1ec51ef08d22b3b54 SHA512 eaca4fe895bb749406f712fb4a04a2be82cbf199f064d11f915fe233cc7c52a381c217a78ac723d63c1625cffe40fc8b8d404cc414b2add3579d37eb70a7b8a8 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38 -AUX spice-vdagent.initd-2 1483 BLAKE2B ba5cf6f1c6b7c112d972f35753bf31fae26283d7df79f5641ae72fa559e501aa78853fd94f50037096b18685d7dd08d5f6221fbb2001f414acd9bfdb616c0b0f SHA512 520b341b4b0a960d4577897d6a0875567375a92521e8f3ead44dd51eaf5df1238d316ed157e19fae3e28b34bcb98599deb7d13734e606dd2a5a9bfddb06e690a AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb52c0d409f5e85c51ac69b2ed1f6fa1b0ea377cae0e2879ed7d0ae39b93219fc961ed34c3d1d42b771a452932 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516 DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e682210ad40657eb9e5e40489eaab18c9f1d5ef5f97075a4389501050a758e1f56d47132de6b1c74bb153fc6b5e87a698d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e EBUILD spice-vdagent-0.17.0.ebuild 1529 BLAKE2B 0fe73b36c13b53956de50b4336219f3d1be114d9139698e43cef90796a3f15faceac3919222328839e1cf183370d7dfa2fabcaa59215d649a2ab331a6456b49f SHA512 a9f36bec7245932f69e0c6c24055288667d0ceb8a6e99ad389ed913b746b19c12e288fdd7d5f9e07bab558b51c47c89b1a1b6e48d00019db23cf9b2bfce475a1 diff --git a/app-emulation/spice-vdagent/files/spice-vdagent.initd-2 b/app-emulation/spice-vdagent/files/spice-vdagent.initd-2 deleted file mode 100644 index a3194d5c1852..000000000000 --- a/app-emulation/spice-vdagent/files/spice-vdagent.initd-2 +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - after dbus -} - -PIDFILE="/var/run/spice-vdagentd/spice-vdagentd.pid" - -start() { - PORT="${PORT:-/dev/virtio-ports/com.redhat.spice.0}" - DEVICE="${DEVICE:-/dev/uinput}" - - ebegin "Checking for required modules and devices" - - if [[ ! -d /sys/module/uinput ]]; then - modprobe -q uinput - fi - - if [[ ! -d /sys/module/uinput ]]; then - eerror "Module 'uinput' not loaded or not enabled in the kernel" - eend 1 - return 1 - fi - - if [[ ! -c "${PORT}" ]] ; then - eerror "Required virtio port does not exist. Make sure you" - eerror "started the virtual machine with appropriate parameters." - eend 1 - return 1 - fi - eend 0 - - if [[ ! -c ${DEVICE} && -c /dev/input/uinput ]]; then - DEVICE=/dev/input/uinput - fi - - # recreate the directory since /var/run may reside on a ramdisk - mkdir -p /var/run/spice-vdagentd - - # cleanup stalled socket - rm -f /var/run/spice-vdagentd/spice-vdagent-sock - - ebegin "Starting spice VD agent daemon" - start-stop-daemon \ - --start \ - --pidfile "${PIDFILE}" \ - --exec /usr/sbin/spice-vdagentd \ - -- -u "${DEVICE}" ${SPICE_VDAGENT_ARGS} - eend $? -} - -stop() { - ebegin "Stopping spice VD agent daemon" - start-stop-daemon \ - --stop \ - --pidfile "${PIDFILE}" - eend $? -} diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest index a95f7ed4ec9f..424e72c376e9 100644 --- a/app-emulation/vagrant/Manifest +++ b/app-emulation/vagrant/Manifest @@ -1,10 +1,10 @@ AUX vagrant-1.8.1-disable-embedded-cacert.patch 742 BLAKE2B 8ee0008edd9f58eec1e2e5382dd88ad4db9453f4d06da1b0d2db68057de758a35f41b2e16a91bbbf1ac99d0ddf37d801caf0390230a33b61c82d8d3a5618ac1f SHA512 a3c791490f2b34965a3f3303ce064be76c86a6321d3d5616837b104e2db9a318c57ded7c59a925de7c79e6a5dce9a35ca0d90ef37cf8012d257f3e4e03d84508 AUX vagrant.in 1541 BLAKE2B 92f8ee0f67eb1088003b99071d4764f9b1a09a39840dbbf88bbc36db417104bc7e7f177b97368ed10dd65f47e2abedef4f848588c21729f5a5ce1b55a20af430 SHA512 05b6c08eab0f4d5f523cfb4231db673ed66052fc72c27e97228be06a5f881da301538b8ff2e4872e8190ca996b994820a468c54b26759e2ca4036da409ca1a82 -AUX vagrant.in-r1 1703 BLAKE2B d67a05dd62c5471c50a00487689d81d7479dc098be6a6103df1e3fdec617932da0f058267cd3e545fbde4f1479c9119aa447654edf9bc704fedac5bea65c947a SHA512 44ec9c2a18c336baf152ea812d30b8413fc6d3e2a63004563f2becda9487212f3f17ee13e9d54486654f06c2d8ea9a3c778f9ed38f185923eb1f17a41ad20b6d +AUX vagrant.in-r1 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5 DIST vagrant-1.9.8.tar.gz 1127560 BLAKE2B efb6c8b985e92dcf0f933a24480934ec09b990f6cd1ea0ed373eb72c3d41f343cfcfef99ff77f39e5a40ee010dca8c45db68c07db106a73078d2841d65e2e3c0 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1 DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd EBUILD vagrant-1.9.8.ebuild 2169 BLAKE2B 6a8fca05bcb8544be3202fad124d3528065ede3dc1748c636df8309f579917c22fcf29f6fdd8374523609962de86259a55a86edae3fc45b354baf50e73fa4a74 SHA512 ece9364b5437f22a2f441408c0811d14dd93138e7d9cce5ed785847b9e38982c880c808a1ba7668ca24fdeadfdd59a77a931461897eb54266aec4c834549f6b2 EBUILD vagrant-2.0.0.ebuild 2162 BLAKE2B 089a4d828d04c1450df47093ab9eb528a4d2812f0706baf5217136514130e757c05b17f4e9558ef468a6d257ebcb6d379af64c8e827b71a67de63c06727e7392 SHA512 149763cc4f924a7879e0ad2da42f1d8dd74ff2679b44ad4fc3f16be588dab3794a7415decb089a73c15f4a86d44102d4fa58198c49106dc1e58dead8ba8bdea4 -EBUILD vagrant-2.0.1.ebuild 2051 BLAKE2B b13ba8764cc2b29654cf05a7439abc56c24fbe4d4fee7938ace3cce2a2c3356952170f6a43af93b4315752fa27044b74c49f9239f1fa70a2818c8cf1db5d80a4 SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39 +EBUILD vagrant-2.0.1-r1.ebuild 2051 BLAKE2B b13ba8764cc2b29654cf05a7439abc56c24fbe4d4fee7938ace3cce2a2c3356952170f6a43af93b4315752fa27044b74c49f9239f1fa70a2818c8cf1db5d80a4 SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39 MISC metadata.xml 572 BLAKE2B f01dc318ed353ca732a322260e0db9bde437b7d9f56a6fa293c7f1e8f600cc86075e740d1e5669be7e0d87068e1a1075a9c44ee7d39e7d3c00b42605e5461e22 SHA512 37ddaa8e7b99b2b9e1487254af11c2201db8469da1a63e26c64b4cb3499867bd3d15b6e2c8871a1550a92722e76c0509408b148e993592b733fd8d14299aeddc diff --git a/app-emulation/vagrant/files/vagrant.in-r1 b/app-emulation/vagrant/files/vagrant.in-r1 index 7c0405e8a835..134cb31f299c 100644 --- a/app-emulation/vagrant/files/vagrant.in-r1 +++ b/app-emulation/vagrant/files/vagrant.in-r1 @@ -5,16 +5,27 @@ # so that everything loads and compiles to proper directories. for r in ruby24 ruby23 ruby22; do + # not all ruby versions are guaranteed to be installed + if ! command -v "${r}" >/dev/null 2>&1; then + continue + fi + VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" + # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" - "${r}" "${VAGRANT_EXECUTABLE}" "version" &> /dev/null - if [ $? -eq 0 ]; then + + if [ -f ${VAGRANT_EXECUTABLE} ] ;then ruby="${r}" break fi done +if [ -z ${ruby} ]; then + echo "Error: failed to find any usable ruby" + exit 1 +fi + # Export GEM_HOME based on VAGRANT_HOME # # This needs to be set because Bundler includes gem paths diff --git a/app-emulation/vagrant/vagrant-2.0.1-r1.ebuild b/app-emulation/vagrant/vagrant-2.0.1-r1.ebuild new file mode 100644 index 000000000000..a496014e0f41 --- /dev/null +++ b/app-emulation/vagrant/vagrant-2.0.1-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +USE_RUBY="ruby22 ruby23" + +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="http://vagrantup.com/" +SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+virtualbox" + +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/listen-3.1.5 + >=dev-ruby/hashicorp-checkpoint-0.1.1 + >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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/nokogiri-1.7.1 + =dev-ruby/rake-12.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}.in-r1" > "${PN}" || die +} + +all_ruby_install() { + newbashcomp contrib/bash/completion.sh ${PN} + all_fakegem_install + + # provide executable similar to upstream: + # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb + dobin "${PN}" + + # directory for plugins.json + dodir /var/lib/vagrant +} diff --git a/app-emulation/vagrant/vagrant-2.0.1.ebuild b/app-emulation/vagrant/vagrant-2.0.1.ebuild deleted file mode 100644 index a496014e0f41..000000000000 --- a/app-emulation/vagrant/vagrant-2.0.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -USE_RUBY="ruby22 ruby23" - -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="http://vagrantup.com/" -SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+virtualbox" - -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/listen-3.1.5 - >=dev-ruby/hashicorp-checkpoint-0.1.1 - >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-4.1.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/nokogiri-1.7.1 - =dev-ruby/rake-12.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}.in-r1" > "${PN}" || die -} - -all_ruby_install() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install - - # provide executable similar to upstream: - # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb - dobin "${PN}" - - # directory for plugins.json - dodir /var/lib/vagrant -} diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index 75d9fb9b0d3b..a0dbaeede962 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,9 +1,9 @@ AUX vice-2.4.22-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 AUX vice-2.4.27-autotools.patch 353 BLAKE2B 01b25d40ad4dd621e32896b0c7f30715fcf0ea7cce8bffdb742caf241ebb0ed7c7d0d40c2cea852640f8b0e4d84bac1d5a87653c9641a33acd8f177a39130c80 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 AUX vice-31580-ffmpeg-build.patch 2635 BLAKE2B 43a5954851c6c082ddb4073768839708f517999068218e134a2cab57f0c8c6e935d9e988745650e84b386efe738d0710b6a2b9ed7ea419248dd3aa65988192f6 SHA512 fcacbe49c0d7768f1c40b76ac7afdb2ac16f651220e7a2005b0f2c28fa47a7aa466ecf4cf8d7ef43dde6d24d3d2472e70126619a8b25c7e2c9340225c897a3c3 -DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81 -DIST vice-2.4.27.tar.gz 25561665 SHA256 ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec WHIRLPOOL 44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406 -DIST vice-2.4.31.tar.gz 25898329 SHA256 4c38685de5f492463cf1b0a570909bfba0dc5c2ffab3218081b630a47118f4a5 SHA512 eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94 WHIRLPOOL 0c0b57f452d3299050811874988ac9909f970ae4230b2268ee8285bfb358c8f58702141059b973d862eb4b7d7e5084d77b62b13b5b7a10e8718864b790f00500 +DIST vice-2.4.22.tar.gz 25180343 BLAKE2B 9c48539b0ec1604a196211819c43c7cdba970cee404b64fbaa1957bb8167ae9f7f108ba0f54ef0ef82314331694dfc5f6bca0d569ee940d6531ed49cd7bb2ffa SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 +DIST vice-2.4.27.tar.gz 25561665 BLAKE2B 36e8460ef1e4aed9f83caf2b46924766d6830368c947ddfee68ecf992685f950db9e433238b61c34691dadb719ede4e9c5cc7104279e06140e347b04eb8a97a3 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec +DIST vice-2.4.31.tar.gz 25898329 BLAKE2B 113be451d322f21488f23711ce971ff7a83538d3dfd516138fec84f27e4933025bbba8cbbc627111aadad437ab7805491286760b4fe9db915307922d00dba27f SHA512 eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94 EBUILD vice-2.4.22.ebuild 4081 BLAKE2B aac80c7a5dd694f4dcdee8f4d594d84efc767f9715a299411fee645f848c823b5fbfa842c9c6fd6d1500d62d0a80d3ff9ba645500a9ddbcedc59a00d1cd12ae5 SHA512 0903ceb493b762870ed5f41af0fba9414f630918141c1f5b536b6998d74a9724ae29f2a02c3dad086595b08c4a22ab108511f9949d81498f82da890f4e315701 EBUILD vice-2.4.27-r2.ebuild 4203 BLAKE2B c1306597f4b419f8e2ed1018b97578a43199fc538cc747c72e7b7cc7cdc92bad51459808d9e927cb08b682e3382643d6dc46ccabf9233d3a95f38a1ca2056fdd SHA512 934c4c6982f1147da237aa781c712b47935e354db95da715bc67f1a95ec2cbe72ac533300fc4e068b1362ab8c8da58d8df5b3823402dd3aa49e2f6d7ee49a5d8 EBUILD vice-2.4.27-r3.ebuild 4143 BLAKE2B 77043ad81622a50338d5ec02d694eb2dbb3cbbffa4ba92b0fabd9ab52f6ed3918583e171248c04b37dc52f9657fe5bdc9ffde7a4202d853f77a2746377f4cac2 SHA512 6b93a2eb3f2f32360c53837d46623e833ab779f76e1404a23db9d37b46e01c310e1ab2c6de9291ec4c6bdd838ea1fe44f7a6d8c1f70c1dfde8f6917a880c5c5c -- cgit v1.2.3