From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- app-emulation/Manifest.gz | Bin 20511 -> 20520 bytes app-emulation/containerd/Manifest | 4 +- .../containerd/containerd-1.4.3-r2.ebuild | 86 ------ app-emulation/containerd/containerd-1.4.4.ebuild | 82 +++++ app-emulation/crossover-bin/Manifest | 4 +- .../crossover-bin/crossover-bin-19.0.1-r1.ebuild | 229 -------------- .../crossover-bin/crossover-bin-20.0.4.ebuild | 220 ++++++++++++++ app-emulation/docker-cli/Manifest | 5 + app-emulation/docker-cli/docker-cli-20.10.4.ebuild | 63 ++++ .../docker-cli/docker-cli-20.10.5-r1.ebuild | 64 ++++ app-emulation/docker-cli/docker-cli-20.10.5.ebuild | 63 ++++ app-emulation/docker/Manifest | 6 +- app-emulation/docker/docker-20.10.3-r2.ebuild | 293 ++++++++++++++++++ app-emulation/docker/docker-20.10.3.ebuild | 293 ------------------ app-emulation/docker/docker-20.10.4.ebuild | 273 +++++++++++++++++ app-emulation/docker/docker-20.10.5.ebuild | 273 +++++++++++++++++ app-emulation/faudio/Manifest | 4 +- app-emulation/faudio/faudio-21.01.ebuild | 17 +- app-emulation/faudio/faudio-9999.ebuild | 15 +- app-emulation/flannel/Manifest | 2 +- app-emulation/flannel/flannel-0.11.0.ebuild | 6 +- app-emulation/fuse-utils/Manifest | 2 +- app-emulation/fuse-utils/metadata.xml | 9 +- app-emulation/fuse/Manifest | 2 +- app-emulation/fuse/metadata.xml | 9 +- app-emulation/libspectrum/Manifest | 2 +- app-emulation/libspectrum/metadata.xml | 9 +- app-emulation/libvirt/Manifest | 8 +- app-emulation/libvirt/libvirt-6.8.0-r2.ebuild | 6 +- app-emulation/libvirt/libvirt-7.0.0-r1.ebuild | 6 +- app-emulation/libvirt/libvirt-7.1.0.ebuild | 331 +++++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 4 +- app-emulation/lxd/Manifest | 8 +- app-emulation/lxd/files/lxd-4.0.0.initd | 2 +- app-emulation/lxd/lxd-4.0.4-r6.ebuild | 152 ---------- app-emulation/lxd/lxd-4.0.4-r7.ebuild | 2 +- app-emulation/lxd/lxd-4.0.5.ebuild | 153 ++++++++++ app-emulation/protontricks/Manifest | 2 +- .../protontricks/protontricks-1.4.3.ebuild | 2 +- app-emulation/qemu/Manifest | 2 +- app-emulation/qemu/qemu-5.2.0-r2.ebuild | 2 +- app-emulation/runc/Manifest | 2 + app-emulation/runc/runc-1.0.0_rc93.ebuild | 76 +++++ app-emulation/spice-protocol/Manifest | 2 + .../spice-protocol/spice-protocol-0.14.3.ebuild | 14 + app-emulation/virtualbox-modules/Manifest | 3 +- .../virtualbox-modules-6.1.18-binutils-2.36.patch | 39 +++ .../virtualbox-modules-6.1.18.ebuild | 1 + app-emulation/winetricks/Manifest | 4 +- .../winetricks/winetricks-20201206.ebuild | 91 ------ .../winetricks/winetricks-20210206.ebuild | 91 ++++++ 51 files changed, 2107 insertions(+), 931 deletions(-) delete mode 100644 app-emulation/containerd/containerd-1.4.3-r2.ebuild create mode 100644 app-emulation/containerd/containerd-1.4.4.ebuild delete mode 100644 app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild create mode 100644 app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild create mode 100644 app-emulation/docker-cli/docker-cli-20.10.4.ebuild create mode 100644 app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild create mode 100644 app-emulation/docker-cli/docker-cli-20.10.5.ebuild create mode 100644 app-emulation/docker/docker-20.10.3-r2.ebuild delete mode 100644 app-emulation/docker/docker-20.10.3.ebuild create mode 100644 app-emulation/docker/docker-20.10.4.ebuild create mode 100644 app-emulation/docker/docker-20.10.5.ebuild create mode 100644 app-emulation/libvirt/libvirt-7.1.0.ebuild delete mode 100644 app-emulation/lxd/lxd-4.0.4-r6.ebuild create mode 100644 app-emulation/lxd/lxd-4.0.5.ebuild create mode 100644 app-emulation/runc/runc-1.0.0_rc93.ebuild create mode 100644 app-emulation/spice-protocol/spice-protocol-0.14.3.ebuild create mode 100644 app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch delete mode 100644 app-emulation/winetricks/winetricks-20201206.ebuild create mode 100644 app-emulation/winetricks/winetricks-20210206.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index ee57e10e1b3f..32c9093f4600 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest index 9dbc093ed110..37b0189f9fc9 100644 --- a/app-emulation/containerd/Manifest +++ b/app-emulation/containerd/Manifest @@ -1,8 +1,8 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa -DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c SHA512 0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80 +DIST containerd-1.4.4.tar.gz 6174959 BLAKE2B 62d0a6bafbdb8da2b7d0f8b9371b566a971eda87b993e54af7a1d40a3d8ee3876bb38cb18c876f6911f91a531235bb448446acc690854b833bd51657df294d6e SHA512 f09930d19f53381d86cf522954458ecc949f15a0c6a49f990bdb61fe19afee075356338998ed84bd756f16ba85211f55f9c638de8b7083d71e24d8e87335e070 EBUILD containerd-1.3.7.ebuild 1976 BLAKE2B e3559d3d0377c627707d8556c3ddad741d7987df808c35df00f9971659a2d09f6332961a2d77eb7eea1d5df6a7a0304148244b652af7fa8805397c1f7c657b68 SHA512 f37f918409e9f5b0316e3cba207a773ccf0fc8317cf12fdc91732d6825848eceb8c03886ad652789aa6f88e9478aefe831536f0ecfcd9adc278f2dd11c9b6a3c EBUILD containerd-1.3.9.ebuild 1943 BLAKE2B 638d7118f30791a508d0647e2a122e53f513b70513749f10458701bc3971ee48d76134166b1b5405f382c26783f3aef8151a45ed8d3e1da2605de10b6a5b7631 SHA512 73d59882125d5782c6a8bf6bafd87331267d1e2281cf04231f67bb1ed91b2153b11fe8e916176eea89794484481e811e83ef7b4af471c655d016cf8cc290a857 -EBUILD containerd-1.4.3-r2.ebuild 2044 BLAKE2B 05a9dcd98dc56b87a41425eaa57e866f61ecf99f74d770db9c0637a75f9e90ae43920504358e9896b1eaf51c20621522ff754580cb1be271ca680b1bb7d2d77b SHA512 d32677001130132dc4399bf913d6d34216ecc328e85a906e704b61ddf81d264d6ebff6c0c28012511bc4f26a85ed47958bdd3736228d52f13413bf4199729c3a +EBUILD containerd-1.4.4.ebuild 1808 BLAKE2B db720b3a72567f865f95556be8ce88cf6e6d60824bca69e026d34d834ef3d70362e1c89e45142aa108613befb2266dd862602135015bae622db01f5faec5f2b5 SHA512 46711ea589aeec237f18a23045f31694c7b852930c235c1becca695f4b05792a64acfc5a77808248cf714922f665004349e0acf3010d3259a30c6ee89558262e MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537 diff --git a/app-emulation/containerd/containerd-1.4.3-r2.ebuild b/app-emulation/containerd/containerd-1.4.3-r2.ebuild deleted file mode 100644 index 90dd18565d1c..000000000000 --- a/app-emulation/containerd/containerd-1.4.3-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# update on bump, look for https://github.com/docker\ -# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer -CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b" -EGO_PN="github.com/containerd/${PN}" - -inherit golang-vcs-snapshot toolchain-funcs - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.io/" -# NOTE: Drop '.gh' on bump, it's there because of bug #764791 -SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" - -DEPEND=" - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp ) -" - -RDEPEND=" - ${DEPEND} - ~app-emulation/runc-1.0.0_rc92 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig - test? ( "${RDEPEND}" ) -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -src_prepare() { - default - sed -i -e "s/git describe --match.*$/echo ${PV})/"\ - -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ - -e "s/-s -w//" \ - Makefile || die -} - -src_compile() { - local options=( - $(usev apparmor) - $(usex btrfs "" "no_btrfs") - $(usex cri "" "no_cri") - $(usex device-mapper "" "no_devmapper") - $(usev seccomp) - $(usev selinux) - ) - - myemakeargs=( - BUILDTAGS="${options[*]}" - DESTDIR="${ED}" - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" - ) - - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - export GOFLAGS="-v -x -mod=vendor" - emake "${myemakeargs[@]}" all man -} - -src_install() { - dobin bin/* - doman man/* - newinitd "${FILESDIR}"/${PN}.initd "${PN}" - keepdir /var/lib/containerd - - # we already installed manpages, remove markdown source - # before installing docs directory - rm -r docs/man || die - - local DOCS=( README.md PLUGINS.md docs/. ) - einstalldocs -} diff --git a/app-emulation/containerd/containerd-1.4.4.ebuild b/app-emulation/containerd/containerd-1.4.4.ebuild new file mode 100644 index 000000000000..fc5462fead93 --- /dev/null +++ b/app-emulation/containerd/containerd-1.4.4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CONTAINERD_COMMIT=05f951a3781f4f2c1911b05e61c160e9c30eaa8e +EGO_PN="github.com/containerd/${PN}" +inherit golang-vcs-snapshot toolchain-funcs + +DESCRIPTION="A daemon to control runC" +HOMEPAGE="https://containerd.io/" +SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" + +DEPEND=" + btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp ) +" + +RDEPEND=" + ${DEPEND} + ~app-emulation/runc-1.0.0_rc92 +" + +BDEPEND=" + dev-go/go-md2man + virtual/pkgconfig + test? ( ${RDEPEND} ) +" + +# tests require root or docker +# upstream does not recommend stripping binary +RESTRICT+=" strip test" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + sed -i -e "s/git describe --match.*$/echo ${PV})/"\ + -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\ + -e "s/-s -w//" \ + Makefile || die +} + +src_compile() { + local options=( + $(usev apparmor) + $(usex btrfs "" "no_btrfs") + $(usex cri "" "no_cri") + $(usex device-mapper "" "no_devmapper") + $(usev seccomp) + $(usev selinux) + ) + + myemakeargs=( + BUILDTAGS="${options[*]}" + DESTDIR="${ED}" + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" + ) + + export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor + export GOFLAGS="-v -x -mod=vendor" + emake "${myemakeargs[@]}" all man +} + +src_install() { + dobin bin/* + doman man/* + newinitd "${FILESDIR}"/${PN}.initd "${PN}" + keepdir /var/lib/containerd + + # we already installed manpages, remove markdown source + # before installing docs directory + rm -r docs/man || die + + local DOCS=( README.md PLUGINS.md docs/. ) + einstalldocs +} diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest index eb1452a01820..fb1a0cddfbd3 100644 --- a/app-emulation/crossover-bin/Manifest +++ b/app-emulation/crossover-bin/Manifest @@ -1,7 +1,7 @@ -DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd DIST install-crossover-19.0.2.bin 227350041 BLAKE2B aeb5424ac02e05662cb4baca2caf0978296bf24184cd40e62fb351dd8420f20707d6c8c0ec683f61b63eee896b58ee923853179c8e933faf3a38384605f4c962 SHA512 6f2cf7c5f64744121b12e2d3f58742df957fbb12c95e15eaf752c0ef56094305265f3ac78b74acecbe1032f6cd42427beb70aae434b29640e7051630d9977903 DIST install-crossover-20.0.2.bin 221393525 BLAKE2B c74db640952002364729c8884234e5fb369a00315d0cfd99276a4294e19953417e1ecc1c60887b3de45bd617570825279d278e69112eddd06d188c890435bcff SHA512 b8d10ef499833cb6158eec22cc635f3e4ecd0a5ebdd9b86df79e23d7f4e4ae1f6a7a2f36d9116e4ba17fd86adfa20bcd19cce66eaa1427fb8ed9667593e5422b -EBUILD crossover-bin-19.0.1-r1.ebuild 7726 BLAKE2B 3a55558f49f39b4be5b12ceba075db440acf0fa29eb6bd22a46d58e5f5c9cb052eef93554231b81d49a18d08d635d38fb5d50bace85b26084b4893af4818cccf SHA512 6a19b275c249f7aa478fea15c4259a5cfc2781c25dddefd531df2e82ba4e6be4eb92d3f33bb30eed1a291fc84f4d483a7c3f6a3b2075dd2b2f0bd5bc91bf2e64 +DIST install-crossover-20.0.4.bin 221436226 BLAKE2B 486494455759d92f8e7e5d35968a603e41a0674cb0752e7d5ba4893d33e77b3e31fea2ebe75d471e2478e7f3cce9be2f712840f1f50bfe790fec5ec936b804a5 SHA512 78252d29f8a72a8742d57a65a60d09a81a70a98517b67468dac96af94ee8af7a313f164af6717f9a9c657095e66466809e08584c7a0fde3bd58c27ff00f41067 EBUILD crossover-bin-19.0.2.ebuild 7234 BLAKE2B 61666e4d1e3dcc81147c347a02a72498cfe1353f0e76200ae65f9b7e6cad5d105ab2c3b18c444abd8dc02461dc457ad160bd3092c82f8654b149355078e2a6be SHA512 43bba4659f10f3219d522c11cc0ad2aa36d8da02ad8df8cc8abfbf402b1ca6465e3024e8f87fe58d5a016eb73b4e87840078072a1e422ef98ab9e036a45a1896 EBUILD crossover-bin-20.0.2-r1.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c +EBUILD crossover-bin-20.0.4.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild deleted file mode 100644 index c993870eec79..000000000000 --- a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -inherit python-single-r1 unpacker - -DESCRIPTION="Commercial version of app-emulation/wine with paid support" -HOMEPAGE="https://www.codeweavers.com/products/" -SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin" - -LICENSE="CROSSOVER-3" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RESTRICT="bindist test" - -QA_FLAGS_IGNORED="opt/cxoffice/.*" -QA_PRESTRIPPED=" - opt/cxoffice/lib/.* - opt/cxoffice/lib64/.* - opt/cxoffice/bin/cxburner - opt/cxoffice/bin/cxntlm_auth - opt/cxoffice/bin/wineserver - opt/cxoffice/bin/wineserver32 - opt/cxoffice/bin/wineserver64 - opt/cxoffice/bin/wine64-preloader - opt/cxoffice/bin/unrar - opt/cxoffice/bin/wine-preloader - opt/cxoffice/bin/cxdiag - opt/cxoffice/bin/cxdiag64 - opt/cxoffice/bin/cxgettext - opt/cxoffice/bin/wineloader - opt/cxoffice/bin/wineloader64 -" -QA_TEXTRELS=" - opt/cxoffice/lib/wine/* - opt/cxoffice/lib/libwine.so* -" - -S="${WORKDIR}" - -DEPEND="" -BDEPEND="${PYTHON_DEPS} - app-arch/unzip - dev-lang/perl - dev-util/bbe -" - -RDEPEND="${DEPEND} - ${PYTHON_DEPS} - !prefix? ( sys-libs/glibc ) - !app-emulation/crossover-office-pro-bin - !app-emulation/crossover-office-bin - capi? ( net-libs/libcapi[abi_x86_32(-)] ) - cups? ( net-print/cups[abi_x86_32(-)] ) - gsm? ( media-sound/gsm[abi_x86_32(-)] ) - jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) - lcms? ( media-libs/lcms:2 ) - ldap? ( net-nds/openldap[abi_x86_32(-)] ) - gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) - gstreamer? ( - media-libs/gstreamer:1.0[abi_x86_32(-)] - jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) - media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] - ) - mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) - nls? ( sys-devel/gettext[abi_x86_32(-)] ) - openal? ( media-libs/openal[abi_x86_32(-)] ) - opencl? ( virtual/opencl[abi_x86_32(-)] ) - opengl? ( - virtual/glu[abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - ) - pcap? ( net-libs/libpcap[abi_x86_32(-)] ) - png? ( media-libs/libpng:0[abi_x86_32(-)] ) - scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) - ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) - v4l? ( media-libs/libv4l[abi_x86_32(-)] ) - vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) - dev-libs/gobject-introspection - dev-util/desktop-file-utils - media-libs/alsa-lib[abi_x86_32(-)] - media-libs/freetype:2[abi_x86_32(-)] - media-libs/mesa[abi_x86_32(-),osmesa?] - media-libs/tiff:0[abi_x86_32(-)] - sys-auth/nss-mdns[abi_x86_32(-)] - sys-apps/util-linux[abi_x86_32(-)] - sys-libs/ncurses-compat:5[abi_x86_32(-)] - sys-libs/zlib[abi_x86_32(-)] - x11-libs/libICE[abi_x86_32(-)] - x11-libs/libSM[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXau[abi_x86_32(-)] - x11-libs/libXcursor[abi_x86_32(-)] - x11-libs/libXdmcp[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXi[abi_x86_32(-)] - x11-libs/libXrandr[abi_x86_32(-)] - x11-libs/libXxf86vm[abi_x86_32(-)] - x11-libs/libxcb[abi_x86_32(-)] - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] -" - -pkg_nofetch() { - einfo "Please visit ${HOMEPAGE}" - einfo "and place ${A} into your DISTDIR directory" -} - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} -} - -src_prepare() { - default - - sed -i \ - -e "s:xdg_install_icons(:&\"${ED}\".:" \ - -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \ - -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \ - "${S}/lib/perl/CXMenuXDG.pm" - - # Remove unnecessary files, license.txt file kept as it's used by - # multiple files (apart of the menu to show the license) - rm -r guis/ || die "Could not remove files" - use doc || rm -r doc/ || die "Could not remove files" -} - -src_install() { - # Install crossover symlink, bug #476314 - dosym ../cxoffice/bin/crossover /opt/bin/crossover - - # Install documentation - dodoc README changelog.txt - rm README changelog.txt || die "Could not remove README and changelog.txt" - - # Install files - dodir /opt/cxoffice - #cp -r ./* "${ED}/opt/cxoffice" \ - find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \ - || die "Could not install into ${ED}/opt/cxoffice" - - # Install configuration file - insinto /opt/cxoffice/etc - doins share/crossover/data/cxoffice.conf - dodir /etc/env.d - echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die - - # Konqueror in its infinite wisdom decides to try opening things for - # writing, which are sandbox violations. This breaks the install process if - # it is installed, so we ninja edit it to false so it so doesn't run. - sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ - || die "Could not apply workaround for konqueror" - - # Install menus - # XXX: locate_gui.sh automatically detects *-application-merged directories - # This means what we install will vary depending on the contents of - # /etc/xdg, which is a QA violation. It is not clear how to resolve this. - XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \ - "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \ - || die "Could not install menus" - - # Revert ninja edit - sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ - || die "Could not apply workaround for konqueror" - - rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \ - || die "Could not remove uninstall menus" - sed -i \ - -e "s:\"${ED}\".::" \ - -e "s:${ED}::" \ - "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \ - || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" - sed -i -e "s:${ED}:/:" \ - "${ED}/usr/share/applications/"*"CrossOver.desktop" \ - || die "Could not fix paths of *.desktop files" - - # Workaround missing libs - # https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658 - if use gphoto2; then - bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die - mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die - bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die - mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die - fperms a+x "/opt/cxoffice/bin/cxdiag" - fi - # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900 - if use pcap; then - dosym "../../../usr/lib64/libpcap.so.1.9.1" "/opt/cxoffice/lib64/libpcap.so.0.8" - dosym "../../../usr/lib32/libpcap.so.1.9.1" "/opt/cxoffice/lib/libpcap.so.0.8" - fi -} - -pkg_postinst() { - einfo "${P} is open source software with the exception of the GUI." - einfo "Source code can be obtained from:" - einfo - einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz" - - # The check done by /opt/cxoffice/bin/cxdiag is far superior to this. - # However, we do this check because I noticed that we could end up with a - # system that doesn't have a working OpenCL according to cxdiag, yet the - # dependencies have been installed. This is a defensive measure to reduce - # user frustration. A more robust check might be worthwhile. - if use opencl; then - local b32=false - local b64=false - if [[ ! -e "${EROOT}/usr/lib32/libOpenCL.so.1" ]]; then - b32=true - ewarn "32-bit libOpenCL.so.1 missing." - fi - - if use amd64 && [[ ! -e "${EROOT}/usr/lib64/libOpenCL.so.1" ]]; then - b64=true - ewarn "64-bit libOpenCL.so.1 missing." - fi - - if $b32 || $b64; then - ewarn - ewarn "Set OpenCL via eselect opencl to avoid problems" - fi - fi -} diff --git a/app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild new file mode 100644 index 000000000000..931771d2ae57 --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support" +HOMEPAGE="https://www.codeweavers.com/products/" +SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-3" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="bindist test" + +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED=" + opt/cxoffice/lib/.* + opt/cxoffice/lib64/.* + opt/cxoffice/bin/cabextract + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/wineserver32 + opt/cxoffice/bin/wineserver64 + opt/cxoffice/bin/wine64-preloader + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxdiag64 + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + opt/cxoffice/bin/wineloader64 +" +QA_TEXTRELS=" + opt/cxoffice/bin/wineserver32 + opt/cxoffice/lib/wine/* + opt/cxoffice/lib/libwine.so* +" + +S="${WORKDIR}" + +DEPEND="" +BDEPEND="${PYTHON_DEPS} + app-arch/unzip + dev-lang/perl + dev-util/bbe +" + +RDEPEND="${DEPEND} + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + !prefix? ( sys-libs/glibc ) + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + capi? ( net-libs/libcapi[abi_x86_32(-)] ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:2 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + gstreamer? ( + media-libs/gstreamer:1.0[abi_x86_32(-)] + jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) + media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] + ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opencl? ( virtual/opencl[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-libs/openssl + dev-util/desktop-file-utils + media-libs/alsa-lib[abi_x86_32(-)] + media-libs/freetype:2[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-),osmesa?] + media-libs/tiff:0[abi_x86_32(-)] + sys-auth/nss-mdns[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/libunwind[abi_x86_32(-)] + sys-libs/ncurses-compat:5[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXcursor[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] + x11-libs/vte:2.91[introspection] +" + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} into your DISTDIR directory" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + default + + sed -i \ + -e "s:xdg_install_icons(:&\"${ED}\".:" \ + -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \ + -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \ + "${S}/lib/perl/CXMenuXDG.pm" + + # Remove unnecessary files, license.txt file kept as it's used by + # multiple files (apart of the menu to show the license) + rm -r guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym ../cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + #cp -r ./* "${ED}/opt/cxoffice" \ + find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \ + || die "Could not install into ${ED}/opt/cxoffice" + + # Disable auto-update + sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + dodir /etc/env.d + echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die + + # Konqueror in its infinite wisdom decides to try opening things for + # writing, which are sandbox violations. This breaks the install process if + # it is installed, so we ninja edit it to false so it so doesn't run. + sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ + || die "Could not apply workaround for konqueror" + + # Install menus + # XXX: locate_gui.sh automatically detects *-application-merged directories + # This means what we install will vary depending on the contents of + # /etc/xdg, which is a QA violation. It is not clear how to resolve this. + XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \ + "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \ + || die "Could not install menus" + + # Revert ninja edit + sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ + || die "Could not apply workaround for konqueror" + + rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \ + || die "Could not remove uninstall menus" + sed -i \ + -e "s:\"${ED}\".::" \ + -e "s:${ED}::" \ + "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \ + || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" + sed -i -e "s:${ED}:/:" \ + "${ED}/usr/share/applications/"*"CrossOver.desktop" \ + || die "Could not fix paths of *.desktop files" + + # Workaround missing libs + # https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658 + if use gphoto2; then + bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die + mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die + bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die + mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die + fperms a+x "/opt/cxoffice/bin/cxdiag" + fi + # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900 + # https://bugs.gentoo.org/721108 + if use pcap; then + bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die + bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die + mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die + mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die + fi +} + +pkg_postinst() { + einfo "${P} is open source software with the exception of the GUI." + einfo "Source code can be obtained from:" + einfo + einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz" +} diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest index 7a58237de8c4..33e3a4c5bd70 100644 --- a/app-emulation/docker-cli/Manifest +++ b/app-emulation/docker-cli/Manifest @@ -1,5 +1,10 @@ DIST docker-cli-20.10.2.tar.gz 7706210 BLAKE2B c8d537be8344dbd2113232c85a52f001231fdf653819710cf4492c86d58662e5f0d74f6fb00593d1034b5d481f15524cec89e2b3463900705a545b2051ab38d2 SHA512 907c846bf4043dcce4dd4e95e6335554b50e954464a83f75a44b1c0fcf9f2625c490a12758d18653c0d031768878a3f6fc91cb7fc6e1d3235d5e8f21ecd93caf DIST docker-cli-20.10.3.tar.gz 7733821 BLAKE2B ab71e6817e7fe0d7c5f8c776cb25ae7bc49b5a224c835fe833988b67dfdf562207cd0afed4710d33e8a31156bd16bdc70df13f1194e862314add069c320c4e6e SHA512 769bed3e5409f6be570ab3672bef1bea4d16d5bfaeb81af8c4b3b7cfb56732c108c5404464731c001cf94fefd77c40a142bed80c85f1b058041e187453a6b88e +DIST docker-cli-20.10.4.tar.gz 7735373 BLAKE2B 7bbdbaec4e97498c9d6aa66f9e6168afd7dc510f7746f94eff275a00bff23548562e8b879bc70c5018e0b75ebf609e0e68173bc244a441c739687d01eb8b9a3c SHA512 861f69657ac3eede228983b7d845ce98c81f4b0aa601aab37024d3f21cf1ca73a182d33bdde8fb9ad89e4954c3903dc4ec2b81fcf7364941a7c38a80ea410e34 +DIST docker-cli-20.10.5.tar.gz 7734031 BLAKE2B 3f20c5acaaa0d2fa91bf8e94f5b4b0b8ecd4d35fd3bfef3beb91f64fa832318d351bcbd4b1dac51550bc91efb748fb6d5aa4f71143001d194f066437ab3552c5 SHA512 868e19fa834993bbd20a0d28a57f364287f39434355ccf90e63f3ead8d55fe488ac3bdab3f85230bfbede318b93513536f36da131fc17c27763a5375b4e0c636 EBUILD docker-cli-20.10.2.ebuild 1823 BLAKE2B f2cfec3be88532c82bd2b875978a2ce8ee90629747eebd471b3ad1f434c15b34d6fb6edea495863f1d091cab577a1f96355b6afbd7179baa161c01423555d2e9 SHA512 6c0050f769bf95fc9c02063f3597f6199a0f1f822a5b740fcc49872e1652a6fdcd535a926b5e3b512f61a49cfa3852a412c4bffb65ffbc3cdbc8658d44bb46da EBUILD docker-cli-20.10.3.ebuild 1823 BLAKE2B 232555c2644df9900218045ba16e10f922fc64973fe2883d64c47321bc83af2b2682c9e9926661df2600f5b216e4b885de2ff8ea40f1994d5e99d7c3513057fa SHA512 f9c02bbc7aba914229a8b4acb89ff5d7d47edda4472d34b805b462a33c85389104d57a1f5be968e9c5499fb2c8935c4face373a857d9e7d046e2c1a6a138731f +EBUILD docker-cli-20.10.4.ebuild 1768 BLAKE2B b66d801ab91a210b46490e52e040a46f14889615d901ec4682d7caf22544473d0ab1df1d76f90c8210144b4bf26745bda478e4f09c7c8b2e807914137c47fb39 SHA512 a60652d4ac58198cd3e0d37232f8ee4b76d104a498c79fae277092ec94eb25a6767e0b6bb4e9c7ce2cec842aed852e8893a6de108c5c15972438683be43a1e97 +EBUILD docker-cli-20.10.5-r1.ebuild 1811 BLAKE2B 91a14e57e8b29d7b74a1463f3aa00526d0943fbf2e3b10f48959dd586663b9d944d999ad985b71a5f0586f7084929a318ce9f44b253ad6853561d84482abc66c SHA512 5906bcc99bc0435185e81b8bfe2d4567f9506bb9a4c62696c910f587584bd00f2d547d93bc3fe06acf146d518306d213bbab17da7bb6efadbab8fcf566d4dafb +EBUILD docker-cli-20.10.5.ebuild 1768 BLAKE2B 1bdd3da59af0d21d46d4133faefbdf42cac19f0f83b5fc4aec8b35b2dc532fab397e8ba059a7abee6840ba5104604a264db2b6880d54a89d13cd80b3c561c6c8 SHA512 f7a02cc606c1783cb25e59171a4cb311fd2a8bdf29e3a97f3efe2996a4948c6b21fc73456b09809819cd2137790cd508582030cecf75081f5e8508f4f9ba90da MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c diff --git a/app-emulation/docker-cli/docker-cli-20.10.4.ebuild b/app-emulation/docker-cli/docker-cli-20.10.4.ebuild new file mode 100644 index 000000000000..b20c515611a7 --- /dev/null +++ b/app-emulation/docker-cli/docker-cli-20.10.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GIT_COMMIT=48d30b5b32 +EGO_PN="github.com/docker/cli" +inherit bash-completion-r1 golang-vcs-snapshot + +DESCRIPTION="the command line binary for docker" +HOMEPAGE="https://www.docker.com/" +MY_PV=${PV/_/-} +SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="hardened" + +RDEPEND="!' + elog + + if use device-mapper; then + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" + elog + fi + + if use overlay; then + elog " Overlay storage driver/USEflag has been deprecated" + elog " in favor of overlay2 (enabled unconditionally)" + elog + fi + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi + + if use cli; then + ewarn "Starting with docker 20.10.2, docker has been split into" + ewarn "two packages upstream, so Gentoo has followed suit." + ewarn + ewarn "app-emulation/docker contains the daemon and" + ewarn "app-emulation/docker-cli contains the docker command." + ewarn + ewarn "docker currently installs docker-cli using the cli use flag." + ewarn + ewarn "This use flag is temporary, so you need to take the" + ewarn "following actions:" + ewarn + ewarn "First, disable the cli use flag for app-emulation/docker" + ewarn + ewarn "Then, if you need docker-cli and docker on the same machine," + ewarn "run the following command:" + ewarn + ewarn "# emerge --noreplace docker-cli" + ewarn + fi +} diff --git a/app-emulation/docker/docker-20.10.3.ebuild b/app-emulation/docker/docker-20.10.3.ebuild deleted file mode 100644 index fdb096725858..000000000000 --- a/app-emulation/docker/docker-20.10.3.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/docker/docker -GIT_COMMIT=46229ca1d8 -inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -MY_PV=${PV/_/-} -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -# https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, -# for appropriate branchch/version of course -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - dev-libs/libltdl - ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?] - ~app-emulation/docker-proxy-0.8.0_p20201215 - cli? ( app-emulation/docker-cli ) - container-init? ( >=sys-process/tini-0.19.0[static] ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - >=dev-lang/go-1.13.12 - dev-go/go-md2man - virtual/pkgconfig -" - -RESTRICT="installsources strip" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -# see "contrib/check-config.sh" from upstream's sources -CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK - ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - - ~USER_NS - ~SECCOMP - ~CGROUP_PIDS - ~MEMCG_SWAP - - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED - ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR - - ~VXLAN - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER - ~IPVLAN - ~MACVLAN ~DUMMY - - ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR - ~EXT4_FS_SECURITY - ~EXT4_FS_POSIX_ACL -" - -ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" - -ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" -ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" -ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" -ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" -ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" -ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" - -pkg_setup() { - if kernel_is lt 3 10; then - ewarn "" - ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." - ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" - fi - - if kernel_is le 3 18; then - CONFIG_CHECK+=" - ~RESOURCE_COUNTERS - " - fi - - if kernel_is le 3 13; then - CONFIG_CHECK+=" - ~NETPRIO_CGROUP - " - else - CONFIG_CHECK+=" - ~CGROUP_NET_PRIO - " - fi - - if kernel_is lt 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" - fi - - if kernel_is lt 4 7; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is lt 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - ~IOSCHED_CFQ - ~CFQ_GROUP_IOSCHED - " - fi - - if kernel_is lt 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is lt 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - if use aufs; then - CONFIG_CHECK+=" - ~AUFS_FS - ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" - fi - - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - fi - - linux-info_pkg_setup -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export GOPATH="${WORKDIR}/${P}" - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper overlay; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary-daemon || die - grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' - fi - - # build daemon - ./hack/make.sh dynbinary || die 'dynbinary failed' -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - newbin bundles/dynbinary-daemon/dockerd dockerd - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md - dodoc -r docs/* - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker ' - elog - - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - - if use overlay; then - elog " Overlay storage driver/USEflag has been deprecated" - elog " in favor of overlay2 (enabled unconditionally)" - elog - fi - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi - - if use cli; then - ewarn "Starting with docker 20.10.2, docker has been split into" - ewarn "two packages upstream, so Gentoo has followed suit." - ewarn - ewarn "app-emulation/docker contains the daemon and" - ewarn "app-emulation/docker-cli contains the docker command." - ewarn - ewarn "docker currently installs docker-cli using the cli use flag." - ewarn - ewarn "This use flag is temporary, so you need to take the" - ewarn "following actions:" - ewarn - ewarn "First, disable the cli use flag for app-emulation/docker" - ewarn - ewarn "Then, if you need docker-cli and docker on the same machine," - ewarn "run the following command:" - ewarn - ewarn "# emerge --noreplace docker-cli" - ewarn - fi -} diff --git a/app-emulation/docker/docker-20.10.4.ebuild b/app-emulation/docker/docker-20.10.4.ebuild new file mode 100644 index 000000000000..ee31e1085124 --- /dev/null +++ b/app-emulation/docker/docker-20.10.4.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN=github.com/docker/docker +GIT_COMMIT=46229ca1d8 +inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://www.docker.com/" +MY_PV=${PV/_/-} +SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" + +DEPEND=" + acct-group/docker + >=dev-db/sqlite-3.7.9:3 + apparmor? ( sys-libs/libapparmor ) + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) + device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) +" + +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies +# https://github.com/moby/moby/tree/master//hack/dockerfile/install +# make sure docker-proxy is pinned to exact version from ^, +# for appropriate branchch/version of course +RDEPEND=" + ${DEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + >=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20201215 + cli? ( app-emulation/docker-cli ) + container-init? ( >=sys-process/tini-0.19.0[static] ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +BDEPEND=" + >=dev-lang/go-1.13.12 + dev-go/go-md2man + virtual/pkgconfig +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~CGROUP_NET_PRIO + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK + ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP + + ~BLK_CGROUP ~BLK_DEV_THROTTLING + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY + + ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR + ~EXT4_FS_SECURITY + ~EXT4_FS_POSIX_ACL +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if kernel_is lt 5 1; then + CONFIG_CHECK+=" + ~NF_NAT_IPV4 + ~IOSCHED_CFQ + ~CFQ_GROUP_IOSCHED + " + fi + + if kernel_is lt 5 2; then + CONFIG_CHECK+=" + ~NF_NAT_NEEDED + " + fi + + if kernel_is lt 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + linux-info_pkg_setup +} + +src_compile() { + export DOCKER_GITCOMMIT="${GIT_COMMIT}" + export GOPATH="${WORKDIR}/${P}" + export VERSION=${PV} + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + ./hack/make.sh dynbinary || die 'dynbinary failed' +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + newbin bundles/dynbinary-daemon/dockerd dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot:" + if systemd_is_booted || has_version sys-apps/systemd; then + elog " systemctl enable docker.service" + else + elog " rc-update add docker default" + fi + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog ' usermod -aG docker ' + elog + + if use device-mapper; then + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" + elog + fi + + if use overlay; then + elog " Overlay storage driver/USEflag has been deprecated" + elog " in favor of overlay2 (enabled unconditionally)" + elog + fi + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi + + if use cli; then + ewarn "Starting with docker 20.10.2, docker has been split into" + ewarn "two packages upstream, so Gentoo has followed suit." + ewarn + ewarn "app-emulation/docker contains the daemon and" + ewarn "app-emulation/docker-cli contains the docker command." + ewarn + ewarn "docker currently installs docker-cli using the cli use flag." + ewarn + ewarn "This use flag is temporary, so you need to take the" + ewarn "following actions:" + ewarn + ewarn "First, disable the cli use flag for app-emulation/docker" + ewarn + ewarn "Then, if you need docker-cli and docker on the same machine," + ewarn "run the following command:" + ewarn + ewarn "# emerge --noreplace docker-cli" + ewarn + fi +} diff --git a/app-emulation/docker/docker-20.10.5.ebuild b/app-emulation/docker/docker-20.10.5.ebuild new file mode 100644 index 000000000000..b444365e4a9d --- /dev/null +++ b/app-emulation/docker/docker-20.10.5.ebuild @@ -0,0 +1,273 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN=github.com/docker/docker +GIT_COMMIT=363e9a88a1 +inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://www.docker.com/" +MY_PV=${PV/_/-} +SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" + +DEPEND=" + acct-group/docker + >=dev-db/sqlite-3.7.9:3 + apparmor? ( sys-libs/libapparmor ) + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) + device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) +" + +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies +# https://github.com/moby/moby/tree/master//hack/dockerfile/install +# make sure docker-proxy is pinned to exact version from ^, +# for appropriate branchch/version of course +RDEPEND=" + ${DEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + >=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20201215 + cli? ( app-emulation/docker-cli ) + container-init? ( >=sys-process/tini-0.19.0[static] ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +BDEPEND=" + >=dev-lang/go-1.13.12 + dev-go/go-md2man + virtual/pkgconfig +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~CGROUP_NET_PRIO + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK + ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP + + ~BLK_CGROUP ~BLK_DEV_THROTTLING + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY + + ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR + ~EXT4_FS_SECURITY + ~EXT4_FS_POSIX_ACL +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if kernel_is lt 5 1; then + CONFIG_CHECK+=" + ~NF_NAT_IPV4 + ~IOSCHED_CFQ + ~CFQ_GROUP_IOSCHED + " + fi + + if kernel_is lt 5 2; then + CONFIG_CHECK+=" + ~NF_NAT_NEEDED + " + fi + + if kernel_is lt 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + linux-info_pkg_setup +} + +src_compile() { + export DOCKER_GITCOMMIT="${GIT_COMMIT}" + export GOPATH="${WORKDIR}/${P}" + export VERSION=${PV} + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + ./hack/make.sh dynbinary || die 'dynbinary failed' +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + newbin bundles/dynbinary-daemon/dockerd dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot:" + if systemd_is_booted || has_version sys-apps/systemd; then + elog " systemctl enable docker.service" + else + elog " rc-update add docker default" + fi + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog ' usermod -aG docker ' + elog + + if use device-mapper; then + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" + elog + fi + + if use overlay; then + elog " Overlay storage driver/USEflag has been deprecated" + elog " in favor of overlay2 (enabled unconditionally)" + elog + fi + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi + + if use cli; then + ewarn "Starting with docker 20.10.2, docker has been split into" + ewarn "two packages upstream, so Gentoo has followed suit." + ewarn + ewarn "app-emulation/docker contains the daemon and" + ewarn "app-emulation/docker-cli contains the docker command." + ewarn + ewarn "docker currently installs docker-cli using the cli use flag." + ewarn + ewarn "This use flag is temporary, so you need to take the" + ewarn "following actions:" + ewarn + ewarn "First, disable the cli use flag for app-emulation/docker" + ewarn + ewarn "Then, if you need docker-cli and docker on the same machine," + ewarn "run the following command:" + ewarn + ewarn "# emerge --noreplace docker-cli" + ewarn + fi +} diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest index 0078b2be2602..5d6a69585576 100644 --- a/app-emulation/faudio/Manifest +++ b/app-emulation/faudio/Manifest @@ -8,6 +8,6 @@ EBUILD faudio-19.06.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101 EBUILD faudio-19.09.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca EBUILD faudio-20.02.ebuild 2506 BLAKE2B a313fbda2f0ed92df9bd0452f7a872e8701c093c5e9d847bda62cd673ce55f22f5768b4d22e28e9021e4501ee6dbee64dc5d6727ce6f42f0b629f1be9e6c18a0 SHA512 c5bd2e5fdb42e47802e4cc244fbcbd20ff77de4cd864c64968d437c0ef2e0d590924b1c5cf6813f3edb8534713fcf5a80cb039cbbeb0e0c1cb0893b9d74c06de EBUILD faudio-20.09.ebuild 2483 BLAKE2B 944768d0ef945ff0c31c4c4ddbde47738cf0cc7ff1615b2dc80849d265043c7dd389b64345d6170d9b07fe2bac3ad26a880714dbd950d988f4472bb703a023ae SHA512 9fff1096c2dc131f16424ac2d0d6b3b6f97d4521d8f2aeadcdb1419264d0803be9fc8900280058d3477bf6cba01b0cd59fb814f7ffb0461a4b1295a9148e8e9f -EBUILD faudio-21.01.ebuild 2531 BLAKE2B 49e1c0290fdd96c80571b5d32d1827db3474bafe0f57b7120134c20b31c25b6387dcf4a38ec134fda021ad6a4a499019b88be5e5853cef613a719a9a4f0d58bb SHA512 f076c1bff74c910500054e106d1b635123acdb9637aa884478d77b42c29e0b4deca495cc67c14a8a21c061a3551aabff7e5b85b899859af40a3ade2155e6553d -EBUILD faudio-9999.ebuild 2531 BLAKE2B 49e1c0290fdd96c80571b5d32d1827db3474bafe0f57b7120134c20b31c25b6387dcf4a38ec134fda021ad6a4a499019b88be5e5853cef613a719a9a4f0d58bb SHA512 f076c1bff74c910500054e106d1b635123acdb9637aa884478d77b42c29e0b4deca495cc67c14a8a21c061a3551aabff7e5b85b899859af40a3ade2155e6553d +EBUILD faudio-21.01.ebuild 2443 BLAKE2B f3a98e771a7a547ef82e5fae209fad3fb1501aa63d186f0e87d04ad2b6e5bc644e43b05ce693e8d16306cac4790542057d153ba57972fb31fbe66dc943f39c5b SHA512 c4b171617d51df15087d6e95627f6eb83c087994fd8f8166ffd3151c60a39d75547250e4686ba59b3df6e550b4e25a6dc41afa3f61390cb212439b3b7c03c67c +EBUILD faudio-9999.ebuild 2445 BLAKE2B ae0a98508607c24dcc8769453a44edb0d8490f624724ac36151530e14c09fb344ffec5e581d90b4d90f452819c68f373de3d2022f86bb699bac4bc6368f4ffda SHA512 b736d81a07e2219d5734ded7dc72d5fef8c26db8e0f5c19c0fa0a99598789284f25f49e47f6040de1b6faa9ac600f5783d766ed845bbe9470316a9a8b3ca20c2 MISC metadata.xml 1414 BLAKE2B 5780361588a5f05dd9cc4d935642aeb7f89c28fb126b1e8bec0a09044eb9386b742e57fd06523babdfdb0d0a0b68a05a9ca7d5c4b53dee6e4bb3e10b14e11e25 SHA512 8cd27251e176ae48c50cb0cf6b632fee1178903c832e60a6afc74119fe8fd55328a92ad7d4f16e23a27812d98efdc5b21fb2e118da04e34dbf62b1843e039471 diff --git a/app-emulation/faudio/faudio-21.01.ebuild b/app-emulation/faudio/faudio-21.01.ebuild index 52c652a59596..de43fa552706 100644 --- a/app-emulation/faudio/faudio-21.01.ebuild +++ b/app-emulation/faudio/faudio-21.01.ebuild @@ -4,6 +4,7 @@ # shellcheck disable=SC2034 EAPI=7 +CMAKE_ECLASS=cmake CMAKE_MAKEFILE_GENERATOR="emake" MULTILIB_COMPAT=( abi_x86_{32,64} ) @@ -18,7 +19,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git" else SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${FAUDIO_P}" fi @@ -31,24 +32,20 @@ IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" -COMMON_DEPEND=" +DEPEND=" >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) " -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" +RDEPEND="${DEPEND}" multilib_src_configure() { local mycmakeargs=( "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" "-DBUILD_TESTS=$(usex test ON OFF)" @@ -57,7 +54,7 @@ multilib_src_configure() { "-DGSTREAMER=$(usex gstreamer ON OFF)" "-DXNASONG=$(usex xnasong ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_configure() { @@ -65,13 +62,13 @@ src_configure() { } multilib_src_compile() { - cmake-utils_src_make + cmake_build emake -C "${BUILD_DIR}" all } multilib_src_install() { # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install + cmake_src_install sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild index 52c652a59596..51ecd606fc26 100644 --- a/app-emulation/faudio/faudio-9999.ebuild +++ b/app-emulation/faudio/faudio-9999.ebuild @@ -4,6 +4,7 @@ # shellcheck disable=SC2034 EAPI=7 +CMAKE_ECLASS=cmake CMAKE_MAKEFILE_GENERATOR="emake" MULTILIB_COMPAT=( abi_x86_{32,64} ) @@ -31,24 +32,20 @@ IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" -COMMON_DEPEND=" +DEPEND=" >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) " -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" +RDEPEND="${DEPEND}" multilib_src_configure() { local mycmakeargs=( "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" "-DBUILD_TESTS=$(usex test ON OFF)" @@ -57,7 +54,7 @@ multilib_src_configure() { "-DGSTREAMER=$(usex gstreamer ON OFF)" "-DXNASONG=$(usex xnasong ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_configure() { @@ -65,13 +62,13 @@ src_configure() { } multilib_src_compile() { - cmake-utils_src_make + cmake_build emake -C "${BUILD_DIR}" all } multilib_src_install() { # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install + cmake_src_install sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest index 437576754f83..262c0c6e9ab6 100644 --- a/app-emulation/flannel/Manifest +++ b/app-emulation/flannel/Manifest @@ -5,5 +5,5 @@ AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220 DIST flannel-0.11.0.tar.gz 6443391 BLAKE2B 5358e513a73fec6d8fcdb0182ec814fcf204eb12830f7d60acb3d4432f821ccc9e174fcc7adb57584ab1782c3f285e46b51bb0f76635fab9cf851cb2bd40c1b3 SHA512 72d18cd4ec58ede3848da3b94b7f3e33f8dda59d9fceb13864757998a24f0b312bc5b5d7927d3da8a805475efee469095ac09390fa632eb0c6ef9dd0f5d38a3b -EBUILD flannel-0.11.0.ebuild 1426 BLAKE2B f41763ce9064dc2e1cf6659eff98fc7c0f28705a3194d693372f825d00824efd5ab0b2f846af5b32532c39faa7d4974eac5be929783943ff24dd0f755bff7de0 SHA512 cc814bdc8b873e0d9fbb3f918f421bcd7263c263859d68af3d1dce2039160d91f9a66918e327c273ddeb2052fce117528b1811f7b5ece3886e75701424cd3974 +EBUILD flannel-0.11.0.ebuild 1426 BLAKE2B 72e3d0d151d883a75228546e2e0d8d7ec2ee2a743678413a8ce43b8e6e2baa1f327283a879ff1d524801bf562b31e5a84a4f0845bca94ca588187c91cd1d8a7d SHA512 5c0f1916eef8df70f6f0871d114c084ca195aed4ca173ba1cece7b7ee94947b162d4f3307762b53c9afd20349a32fb0661e3a9683afebe2f40695a0a14b9bdbd MISC metadata.xml 305 BLAKE2B d34792ab0473ba56a75b4e9dc559b4a12b2eed48313cfecac65ce7b13a9df59a651721fbdd72a744314181f4002b52510c9200b85c1fac6fa03d3d78573db842 SHA512 ff219bf7233d4659475fd4e25366d5eef5d3575cd1250d6c9bbddc7351515418ca17730a8df61d102c71b515813b20bb182b355448db16b5fb43a9a46401bd04 diff --git a/app-emulation/flannel/flannel-0.11.0.ebuild b/app-emulation/flannel/flannel-0.11.0.ebuild index a5f28c4632f6..2ba1cf0dfa67 100644 --- a/app-emulation/flannel/flannel-0.11.0.ebuild +++ b/app-emulation/flannel/flannel-0.11.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit golang-vcs-snapshot systemd user +inherit golang-vcs-snapshot systemd user tmpfiles KEYWORDS="~amd64 ~arm64" DESCRIPTION="An etcd backed network fabric for containers" @@ -45,7 +45,7 @@ src_install() { keepdir /var/log/${PN} insinto /etc/logrotate.d newins "${FILESDIR}"/flanneld.logrotated flanneld - systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf + newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf systemd_dounit "${FILESDIR}/flanneld.service" dodoc README.md } diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest index 787d472fad5f..83f4c9c32b3c 100644 --- a/app-emulation/fuse-utils/Manifest +++ b/app-emulation/fuse-utils/Manifest @@ -1,4 +1,4 @@ AUX remove-local-prefix.patch 841 BLAKE2B c29e10ed335d431c0cbd88a26028c03599c32d9ded001fa1f61f805589bd1c52352b52ac8f99c147af315ee91d65681d1c0aa355567108f92767f36fa6f6dee1 SHA512 c15ac87af402e06296d76459a13b5817be7393839ca1566c6f0eefaa3055f7f3f0dc7589f762d9caa0e0bd356790bbb1aca5c3ee6166155577bf3520f25ed125 DIST fuse-utils-1.4.3.tar.gz 501006 BLAKE2B 0637fe05b71416e89eb61e3618ff45bd71250201924fb3741a4c5b9898d09b30acecba9957baeaa864c2c9cfe1bcb9cb38a2af83368bc5729221cec36a1eda47 SHA512 13404d1be81a2de9262cd79cce9dd8dc3f17238fdbb75da8a724b76b0976c03f34da9978af36b808103fedcf3f5d5da4bb10f251c5510127d59ca8de5607b99e EBUILD fuse-utils-1.4.3.ebuild 906 BLAKE2B 5d0e2325e3256617e87a1a147626cfa74b3e77638dc0218a45952e469cdf046ca76e97f61667f41bd63965795fbdc69ec3adf0689f6f7464795608dca71415bd SHA512 0d64435c04cfeb91259f0969aeb99b2d84128861772f9c2baa344bb4956b18c9d14e0d8e7251c9491b7a0fabd6fb82d8e590ef210263c6e5050b2dd11724b347 -MISC metadata.xml 602 BLAKE2B 434afcae9b53d97c7c5ed9f4c5dca410f6f5b39716b751a5a04458a9420652b8403dbbe1d24f73ebaebea34f45f7d6138ade181388772a5294419c86fd033d78 SHA512 42657b608b54739aa7d1cc56c7172bac79b00d327594334e13c471fa52c5d2e026aedff351758b5a292bc89b19d340ee04727ed5a551b9f6c944b096762dae17 +MISC metadata.xml 389 BLAKE2B 3dbdab50b92657766b2c72e4123275c5b2b58e032ef5f944b2e771d985a6a6c84058c1e28287be157a01c36203b8278e2c091b491725124460d9caf51004059d SHA512 822ec5f3821519739d0e1bba1f66ac3e14925f00c9ffe1557867dece79c3832e2c48c4e3091b8fa79dbf09101dcc6de35d3bb4610467f849ae731de86b1ee247 diff --git a/app-emulation/fuse-utils/metadata.xml b/app-emulation/fuse-utils/metadata.xml index 31a5bcaf4749..a335d4fddda0 100644 --- a/app-emulation/fuse-utils/metadata.xml +++ b/app-emulation/fuse-utils/metadata.xml @@ -1,14 +1,7 @@ - - 0xe2.0x9a.0x9b@gmail.com - Jan Ziak - - - proxy-maint@gentoo.org - Gentoo Proxy Maintainers Project - + Use dev-libs/libgcrypt for low-level crypto of some features, including logfiles. diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest index ec8eea92f7e3..b1a80def7fba 100644 --- a/app-emulation/fuse/Manifest +++ b/app-emulation/fuse/Manifest @@ -2,4 +2,4 @@ AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d08 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b -MISC metadata.xml 801 BLAKE2B 0a1504d02b423a72ad2d087489f9a0808dd2fb60643dc5c4a90625ce888cb6e9469195c919a3f9827bc0731afdf3ba739c2649692070c9d468a391e77eb9117a SHA512 dcb8d6a43cea89804e932e07dedf7d0fa3cabaf31aaa697f062e6e22a24c3c49e12a918e0cfd353d814ce1973c643b08f27710f95e696736bba2f174fbda76d5 +MISC metadata.xml 588 BLAKE2B 4a3aeb05e4788fbd18b8d6f2d741e00f1b6f7a849fa0179afb9aa1d7e6f44f29c3ecaa4a527d280b940e7a5dd2ac7e4557184ffabdfc41f743389847dae71c83 SHA512 8c3695d6e28639e0741888eb51487b898e9452c560f486577d4ba412802a3a33630ef72f9ce8df928aa1a8a80ae238df7a7e49c2f945e43ebe7f5db5936c7163 diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml index 38319f64f42e..04bb5c6c82aa 100644 --- a/app-emulation/fuse/metadata.xml +++ b/app-emulation/fuse/metadata.xml @@ -1,14 +1,7 @@ - - 0xe2.0x9a.0x9b@gmail.com - Jan Ziak - - - proxy-maint@gentoo.org - Gentoo Proxy Maintainers Project - + fuse-emulator diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest index f01b6aa408ad..848028824255 100644 --- a/app-emulation/libspectrum/Manifest +++ b/app-emulation/libspectrum/Manifest @@ -1,4 +1,4 @@ AUX remove-local-prefix.patch 851 BLAKE2B 1e1b787c10499bfbeafca43b08f4cbd8c7525841c641a3fa1211822a7ec3e98b11c9925b1bd9cc8ac3b14e5d0625c34727a330e00f0e3aaf5aba1871a8810647 SHA512 bae42eec33ff2ae00547d8c649b8164fd5665b70e95b07f95cdcce41e342702de559c4b63d6ce95a97407d2e8012c7fe0142b923603c1c1d25b8978f29aaf7a3 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2 EBUILD libspectrum-1.4.4.ebuild 1040 BLAKE2B c66daea0426b3fbfc816255e49501a9e4162a25436c2dc35519b09e213980f75f3d691b198cc90574d319403f03477efb2ff256a9c9bef7290b65564ed7daa29 SHA512 cc20f0cb9bbfb3d34ba04c4d9a94a58cc14d53363b2a4f8536c0e1368066d3e5970e9a7cafc3f9d564f071b577e3df7e1c008a64168b98912f12208ce6ca9e99 -MISC metadata.xml 941 BLAKE2B 7ac8ef35dfa24899f6990e5c92f5c2f70328575196308cd28f6dab967b9c39e73dabfea007c0cbf4a90bf73f5739d9c4a17b22cbe8c670b3a2d5531d47763520 SHA512 79cbe79daa7805ab944614d7d8370bc82e3ce6ecab7218112163ca118198bf176a1a06c87f8e24117f0a293d6dcc1cd0c02477e56655d66eb9b928c7ba7fabdc +MISC metadata.xml 728 BLAKE2B 82be49422307c4d16f84303d43ad0f16af9c1b67380e7a5c79d8691acbb2af6f25a4be300f8753abc92d833723b1f65d88cec9471136f663067cc7ec90576fc6 SHA512 d1d2634e9b72b06ec8eef16451969e24b0291bad4ec1cc9368881bc28dca0f2afc3fe555dfd8c0fb41ab86c16e3dcf5ffcd45d2619d983e11604d2fed4fc1545 diff --git a/app-emulation/libspectrum/metadata.xml b/app-emulation/libspectrum/metadata.xml index 68b09e35fe36..b24f12aa4850 100644 --- a/app-emulation/libspectrum/metadata.xml +++ b/app-emulation/libspectrum/metadata.xml @@ -1,14 +1,7 @@ - - 0xe2.0x9a.0x9b@gmail.com - Jan Ziak - - - proxy-maint@gentoo.org - Gentoo Proxy Maintainers Project - + libspectrum is a library designed to make the input and output of some ZX Spectrum emulator files slightly easier. It is intended to be usable on Unix diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 1ae0209f1abc..62f679022013 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -14,7 +14,9 @@ AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bb AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34 DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343 -EBUILD libvirt-6.8.0-r2.ebuild 8769 BLAKE2B 5d425a9f6b776869b2d4a886100ed30730ea504b619d76ac24f823583697ea88b0fa039db1cfd927c82351abe0bea97601eb06cdb5c0ecf40bc42d65521767d9 SHA512 76a636969fb6b11c9def8cfac402762fa35a474f925beecc40b4bec2b841981a235eaf3bfa272ec63e907275dce332aa03bae8f72f033ed7f2adfae987796e09 -EBUILD libvirt-7.0.0-r1.ebuild 8454 BLAKE2B 50885a689f2a668de85ab03b6592720a6d85a3d0efa3fce9fc06e37ba3db03cc3fcb96958250ca2eb13b07cf421885623a8552fb4232be2c97929be09b990e60 SHA512 0e3b03bffe7416322b30db8a580e6c40c6e840978b0e13863805e640f70ba6a3fb00d87c4c1b3b0ddb05e66b7431f1177e7e1c5aa1bf292a220be321fb034593 -EBUILD libvirt-9999.ebuild 8268 BLAKE2B ce194a4cf1558734a5c6b3e925a6e7e9af530525649557b1b8c990ff23fbf3153864390c90d51557f58be1295dd5f8084263657245b2f8b82a406c47ab34b652 SHA512 9af86bde3f89bda4717ad6fca871d2ee81b196265c91d9664c88b6338d48272341a495470ebe7ac30367b22be2a77626f5c18cf1ad3bce51534445112ac9ad98 +DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9aed7ff7a6d70536ca2eb95d902f0f5ed4b5e56fbdfc6c40f443fb68f4850cff0545256826e575e78fea97158e8f7 SHA512 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6 +EBUILD libvirt-6.8.0-r2.ebuild 8761 BLAKE2B dad229775b97a350f98e2aa20b99abf8032c89c61f464cc40f4470f89889365cab242befe4d5283f3788400b31176e444d52957d638e4e6a3ce0e9003b6b08f5 SHA512 d4d8d79508871a4ba632d134d71e49e15c069d1f249abc695ac398b0bed46331cd0253c41910773904c5d0ea854505c47bd1733a11fde15516776cf0e2757886 +EBUILD libvirt-7.0.0-r1.ebuild 8445 BLAKE2B 9ac249908c83fcfb03b370999afa4c95f83188cf759bf53f55ae7232930348d7174fd93af3ea957426ba44c59b93131c1a3e9f710e69b14473ea6fcc4994fdc5 SHA512 54ffce4674c9a22db3be9878073ba3695ff99cb3c6a9f68540832c9d1f2df2a81ee3e8c89a1805f79cc58b317c8c1496a91ab9f2875bd280967135ec0b131d88 +EBUILD libvirt-7.1.0.ebuild 8197 BLAKE2B a97c4c71f59730b6c145cae14bf546278d988b8b8b13dd130cebd3c0ec64f80c1247a6caa7e80bf4366f703febc2400fffda0e5593478cd83dc2f4a806407377 SHA512 a8bdb21b844f34450e96c2eaeedcb6c87ded9d43f7cceab623dfc64b747e2c74778e6a4ee3cfe8b62cf8f5fefd90384e0746a4a8384791b4b001a94fe9b0b6a7 +EBUILD libvirt-9999.ebuild 8260 BLAKE2B 8fc76c116b738f49b96880260a1b94662a3420ae138e48394d2c62700bddfa49f5817695d7456d25ba7e2823ac2e9a6af1db7fe5087c2e779bcf5f2b3c63db29 SHA512 e4ea3e8096f8052ce6edff1255005ce10251272d953c0aca1157af88e5582382e351c0457a5f5f2271b850e356137ffe8b7643c29cc872c9d55f58950f6b2058 MISC metadata.xml 3568 BLAKE2B ea4e03121fbc3aca8af2d8e12b42fefc9954e8e38fd83b1014353dd83bceeae4e1ba65329b42fb19fc0d6a9aae7c9d16cf88817d4ea7cfe767c7ef5734b291f6 SHA512 4d691fecee1ddd161a67e3b18a6071d1f0f6e1dcc6ae8deb1a63d73ca9c6d86f5a879d8ab9e43397b7988d66a7df9be6f556a52ebfe8d886b1f03e89614cf073 diff --git a/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild index 2e07035bce72..c7a144ac4dd8 100644 --- a/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-6.8.0-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd +inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -312,7 +312,7 @@ src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests diff --git a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild index fcc41af4f916..1f1c28bdb1a9 100644 --- a/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd +inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" SLOT="0/${PV}" fi @@ -307,7 +307,7 @@ src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests diff --git a/app-emulation/libvirt/libvirt-7.1.0.ebuild b/app-emulation/libvirt/libvirt-7.1.0.ebuild new file mode 100644 index 000000000000..16755a56b8ac --- /dev/null +++ b/app-emulation/libvirt/libvirt-7.1.0.ebuild @@ -0,0 +1,331 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" + SRC_URI="" + SLOT="0" +else + SRC_URI="https://libvirt.org/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + SLOT="0/${PV}" +fi + +DESCRIPTION="C toolkit to manipulate virtual machines" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" +LICENSE="LGPL-2.1" +IUSE=" + apparmor audit +caps dtrace firewalld fuse glusterfs iscsi + iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz + parted pcap policykit +qemu rbd sasl selinux +udev + virtualbox +virt-network wireshark-plugins xen zfs +" + +REQUIRED_USE=" + firewalld? ( virt-network ) + libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) + lxc? ( caps libvirtd ) + openvz? ( libvirtd ) + qemu? ( libvirtd ) + virt-network? ( libvirtd ) + virtualbox? ( libvirtd ) + xen? ( libvirtd )" + +BDEPEND=" + app-text/xhtml1 + dev-lang/perl + dev-libs/libxslt + dev-perl/XML-XPath + dev-python/docutils + virtual/pkgconfig" + +# 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=" + acct-user/qemu + app-misc/scrub + >=dev-libs/glib-2.48.0 + dev-libs/libgcrypt:0 + dev-libs/libnl:3 + >=dev-libs/libxml2-2.7.6 + >=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/dbus + sys-apps/dmidecode + sys-devel/gettext + sys-libs/ncurses:0= + sys-libs/readline:= + virtual/acl + apparmor? ( sys-libs/libapparmor ) + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap-ng ) + dtrace? ( dev-util/systemtap ) + firewalld? ( >=net-firewall/firewalld-0.6.3 ) + fuse? ( sys-fs/fuse:0= ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) + iscsi? ( sys-block/open-iscsi ) + iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) + libssh? ( net-libs/libssh ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + 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? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) + qemu? ( + >=app-emulation/qemu-1.5.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[dhcp,ipv6,script] + net-firewall/ebtables + >=net-firewall/iptables-1.4.10[ipv6] + net-misc/radvd + sys-apps/iproute2[-minimal] + ) + wireshark-plugins? ( net-analyzer/wireshark:= ) + xen? ( + >=app-emulation/xen-4.6.0 + app-emulation/xen-tools:= + ) + udev? ( + virtual/libudev + >=x11-libs/libpciaccess-0.10.9 + ) + zfs? ( sys-fs/zfs )" + +DEPEND="${BDEPEND} + ${RDEPEND} + ${PYTHON_DEPS}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-6.7.0-doc-path.patch + "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch +) + +pkg_setup() { + # 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 virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_MARK_T + ~BRIDGE_NF_EBTABLES + ~NETFILTER_ADVANCED + ~NETFILTER_XT_CONNMARK + ~NETFILTER_XT_MARK + ~NETFILTER_XT_TARGET_CHECKSUM + ~IP_NF_FILTER + ~IP_NF_MANGLE + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + ~IP6_NF_FILTER + ~IP6_NF_MANGLE + ~IP6_NF_NAT" + # Bandwidth Limiting Support + use virt-network && CONFIG_CHECK+=" + ~BRIDGE_EBT_T_NAT + ~IP_NF_TARGET_REJECT + ~NET_ACT_POLICE + ~NET_CLS_FW + ~NET_CLS_U32 + ~NET_SCH_HTB + ~NET_SCH_INGRESS + ~NET_SCH_SFQ" + + ERROR_USER_NS="Optional depending on LXC configuration." + + if [[ -n ${CONFIG_CHECK} ]]; then + linux-info_pkg_setup + fi + + python-any-r1_pkg_setup +} + +src_prepare() { + touch "${S}/.mailmap" || die + + default + python_fix_shebang . + + # Tweak the init script: + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die + sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ + -i "${S}/libvirtd.init" || die "sed failed" +} + +src_configure() { + local emesonargs=( + $(meson_feature apparmor) + $(meson_use apparmor apparmor_profiles) + $(meson_feature audit) + $(meson_feature caps capng) + $(meson_feature dtrace) + $(meson_feature firewalld) + $(meson_feature fuse) + $(meson_feature glusterfs) + $(meson_feature glusterfs storage_gluster) + $(meson_feature iscsi storage_iscsi) + $(meson_feature iscsi-direct storage_iscsi_direct) + $(meson_feature libvirtd driver_libvirtd) + $(meson_feature libssh) + $(meson_feature lvm storage_lvm) + $(meson_feature lvm storage_mpath) + $(meson_feature lxc driver_lxc) + $(meson_feature nls) + $(meson_feature numa numactl) + $(meson_feature numa numad) + $(meson_feature openvz driver_openvz) + $(meson_feature parted storage_disk) + $(meson_feature pcap libpcap) + $(meson_feature policykit polkit) + $(meson_feature qemu driver_qemu) + $(meson_feature qemu yajl) + $(meson_feature rbd storage_rbd) + $(meson_feature sasl) + $(meson_feature selinux) + $(meson_feature udev) + $(meson_feature virt-network driver_network) + $(meson_feature virtualbox driver_vbox) + $(meson_feature wireshark-plugins wireshark_dissector) + $(meson_feature xen driver_libxl) + $(meson_feature zfs storage_zfs) + + -Dnetcf=disabled + -Dsanlock=disabled + + -Ddriver_esx=enabled + -Dinit_script=systemd + -Dqemu_user=$(usex caps qemu root) + -Dqemu_group=$(usex caps qemu root) + -Ddriver_remote=enabled + -Dstorage_fs=enabled + -Ddriver_vmware=enabled + + --localstatedir="${EPREFIX}/var" + -Drunstatedir="${EPREFIX}/run" + ) + + meson_src_configure +} + +src_test() { + export VIR_TEST_DEBUG=1 + meson_src_test +} + +src_install() { + meson_src_install + + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run + + # Fix up doc paths for revisions + if [[ $PV != $PVR ]]; then + mv "${D}"/usr/share/doc/${PN}-${PV}/* "${D}"/usr/share/doc/${PF} || die + rmdir "${D}"/usr/share/doc/${PN}-${PV} || die + fi + + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd + + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests + + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then + touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + readme.gentoo_print_elog +} diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index a1cb740eced1..d5252cac3d86 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd +inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -301,7 +301,7 @@ src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf + newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index f60e5247ed98..14b9af79e9a9 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,11 +1,13 @@ AUX lxd-4.0.0.confd 582 BLAKE2B 88ce8ec99eb50174bffea7d3b8bddc67b50fe6677d54df115c9069311b5fb59a72170a15988f50714740074f7ec4f2cd32fb47b6d8c52cf69b8c6fa332162a06 SHA512 96d922ae81677eebace3f8d2dff7f67d58701c40c09e2435677f9289cca89fe260c0d9526059d3772c3405a5b8ec52466bf7d7a920dcdd7551f1b3f01f2fc9c4 -AUX lxd-4.0.0.initd 1223 BLAKE2B 1f7ba04af8d4d22c04312bbf9243f94855e8c4912485bedde7ab8c78e21c0957de0434095811db0be4ee38723cd1e8a9bec01af4420283b297ef547154f31577 SHA512 cecd9da83e1352eec23720e84c7ad85a65dde21344b5c1aca8943f9ac74eeb0e1f66d968bba24592303fed05beefa2959c8cffc0d2e0be59168ded91b84e5fe0 +AUX lxd-4.0.0.initd 1221 BLAKE2B cdff6d900e09f85d9a4dc86b30f0d32b848689e209b79b48217e2f844a48fb358850cbc27db1aed7c1b957bbc19af2d76856fd65319a0a207cedfefbadf659cc SHA512 8b176036c1e5f2ffac4c94e781694fb637fa53666f10da1d5d2b3f1fc341f02003e5306dbd332edd9eeb6f7b08dffd9190c7f65361a40220f6f88d56e4c78a57 AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42c3eef0df995373487c789390dee99420dfd1aa5768ba66ba72999e8f2d8a3b0be6e621185f185b5b85 SHA512 c68c4106e189bd32538f5f2963c43afc30418dd9afeca56e5590f354725eb0126ee0aac02082cc42d69b851f392a4977a4f95cf2886044ad563c9a36facea222 AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661 AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea SHA512 800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b SHA512 7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15 -EBUILD lxd-4.0.4-r6.ebuild 3819 BLAKE2B be531ecbfbab005179ffede6038eb6798297c324c0870064a37e94d473bb6b6e94e42abfe1e623d78f39fc1c0c62923901c8444d2842cbedeca1e08b8f242b17 SHA512 13110a84d788c5834f8cc1deb32d3c8e296d080167923be035198dcc36e026f97b3bcad33f30787cdec68a09e03dbacd03de14902955b2e58c10fbfae8bd2370 -EBUILD lxd-4.0.4-r7.ebuild 3870 BLAKE2B 7adea6e16b9f324d2ec8bd122462ea5b18c29da1c4a4b34f722ed16a328a29f41e919cfe7ae5f13e75cad2e0155b16cd101929a36612c47bc621a40034898cdf SHA512 cc73658faf294ca21cab39f18ebf54638e36c279f2c9e4448275eb714c3bcce3c38acfff2b5ccb5394748a5f8c772b94eee07abbfa26139e363d8e995688a56d +DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0 SHA512 8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211 +DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0 SHA512 b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946 +EBUILD lxd-4.0.4-r7.ebuild 3869 BLAKE2B 947fdd5c859be167b0d0ffd63a2528b74eeb46d77f51047606bc2200e011226ed36a170f4bd5504161314a6dd7eb403c9f41bbdc912fc23d0fa673d6fc2e8356 SHA512 adf8621f08ef42dc15de6f2f5fc0bfa7d5644ea737e6f714dd9f403a34d02c8d94753b9256a0e70fde7e9811b275721562c9fe380626e7638729c012a4058492 +EBUILD lxd-4.0.5.ebuild 3772 BLAKE2B 97597e82a97630698d9b526f60cc88d552d8c598f0bde11c023121100c21926002df7bcf75580badee71e01e3c4742393302e850d56a8efff174dc3540bc465e SHA512 1128b0d28bf2583e1352a6682dff9d0ebf7c7fa678b1457d5449f05f4bbc563db0364866c429b17b46b31c35cb9c7ddd7ef9767dd7a5e5b26fe1100ad854e13c MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0 diff --git a/app-emulation/lxd/files/lxd-4.0.0.initd b/app-emulation/lxd/files/lxd-4.0.0.initd index c55b2da6a84d..e6ae971e879f 100644 --- a/app-emulation/lxd/files/lxd-4.0.0.initd +++ b/app-emulation/lxd/files/lxd-4.0.0.initd @@ -28,7 +28,7 @@ start() { } stop() { - if [[ "${RC_CMD}" = restart ]]; then + if [ "${RC_CMD}" = restart ]; then ebegin "Stopping lxd service (but not containers)" # start-stop-daemon sends SIGTERM with a timeout of 5s by default. # SIGTERM indicates to LXD that it will be stopped temporarily. diff --git a/app-emulation/lxd/lxd-4.0.4-r6.ebuild b/app-emulation/lxd/lxd-4.0.4-r6.ebuild deleted file mode 100644 index 6419fd084033..000000000000 --- a/app-emulation/lxd/lxd-4.0.4-r6.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig - -DESCRIPTION="Fast, dense and secure container management" -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" -SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" - -# Needs to include licenses for all bundled programs and libraries. -LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="apparmor ipv6 nls verify-sig" - -DEPEND="app-arch/xz-utils - >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] - dev-libs/dqlite - dev-libs/lzo - dev-libs/raft - net-dns/dnsmasq[dhcp,ipv6?]" -RDEPEND="${DEPEND} - acct-group/lxd - net-firewall/ebtables - net-firewall/iptables[ipv6?] - sys-apps/iproute2[ipv6?] - sys-fs/fuse:0= - sys-fs/lxcfs - sys-fs/squashfs-tools[lzma] - virtual/acl" -BDEPEND="dev-lang/go - nls? ( sys-devel/gettext ) - verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" - -CONFIG_CHECK=" - ~CGROUPS - ~IPC_NS - ~NET_NS - ~PID_NS - - ~SECCOMP - ~USER_NS - ~UTS_NS -" - -ERROR_IPC_NS="CONFIG_IPC_NS is required." -ERROR_NET_NS="CONFIG_NET_NS is required." -ERROR_PID_NS="CONFIG_PID_NS is required." -ERROR_SECCOMP="CONFIG_SECCOMP is required." -ERROR_UTS_NS="CONFIG_UTS_NS is required." - -# Go magic. -QA_PREBUILT="/usr/bin/fuidshift - /usr/bin/lxc - /usr/bin/lxc-to-lxd - /usr/bin/lxd-agent - /usr/bin/lxd-benchmark - /usr/bin/lxd-p2c - /usr/sbin/lxd" - -EGO_PN="github.com/lxc/lxd" -GOPATH="${S}/_dist" # this seems to reset every now and then, though - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -src_prepare() { - default - - export GOPATH="${S}/_dist" - - sed -i \ - -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ - -e "s:make:make ${MAKEOPTS}:g" \ - Makefile || die - - # Fix hardcoded ovmf file path, see bug 763180 - sed -i \ - -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ - -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ - doc/environment.md \ - lxd/apparmor/instance_qemu.go \ - lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." -} - -src_configure() { :; } - -src_compile() { - export GOPATH="${S}/_dist" - - cd "${S}" || die - - for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do - go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}" - done - - go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" - - use nls && emake build-mo -} - -src_test() { - export GOPATH="${S}/_dist" - go test -v ${EGO_PN}/lxd || die -} - -src_install() { - local bindir="_dist/bin" - export GOPATH="${S}/_dist" - - dosbin ${bindir}/lxd - - for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do - dobin ${bindir}/${l} - done - - cd "${S}" || die - - newbashcomp scripts/bash/lxd-client lxc - - newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd - newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd - - if use apparmor; then - systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service - else - systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service - fi - - systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service - systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket - - dodoc AUTHORS doc/* - use nls && domo po/*.mo -} - -pkg_postinst() { - elog - elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," - elog "including a Quick Start." - elog - elog "Please run 'lxc-checkconfig' to see all optional kernel features." - elog - elog "Optional features:" - optfeature "btrfs storage backend" sys-fs/btrfs-progs - optfeature "lvm2 storage backend" sys-fs/lvm2 - optfeature "zfs storage backend" sys-fs/zfs - elog - elog "Be sure to add your local user to the lxd group." -} diff --git a/app-emulation/lxd/lxd-4.0.4-r7.ebuild b/app-emulation/lxd/lxd-4.0.4-r7.ebuild index b5c87f1d9fde..301aad791c91 100644 --- a/app-emulation/lxd/lxd-4.0.4-r7.ebuild +++ b/app-emulation/lxd/lxd-4.0.4-r7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz # Needs to include licenses for all bundled programs and libraries. LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="apparmor ipv6 nls verify-sig" DEPEND="app-arch/xz-utils diff --git a/app-emulation/lxd/lxd-4.0.5.ebuild b/app-emulation/lxd/lxd-4.0.5.ebuild new file mode 100644 index 000000000000..6463918b080c --- /dev/null +++ b/app-emulation/lxd/lxd-4.0.5.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig + +DESCRIPTION="Fast, dense and secure container management" +HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" +SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="apparmor ipv6 nls verify-sig" + +DEPEND="app-arch/xz-utils + >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] + dev-libs/dqlite + dev-libs/lzo + dev-libs/raft + net-dns/dnsmasq[dhcp,ipv6?]" +RDEPEND="${DEPEND} + acct-group/lxd + net-firewall/ebtables + net-firewall/iptables[ipv6?] + sys-apps/iproute2[ipv6?] + sys-fs/fuse:* + sys-fs/lxcfs + sys-fs/squashfs-tools[lzma] + virtual/acl" +BDEPEND="dev-lang/go + nls? ( sys-devel/gettext ) + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + +CONFIG_CHECK=" + ~CGROUPS + ~IPC_NS + ~NET_NS + ~PID_NS + + ~SECCOMP + ~USER_NS + ~UTS_NS +" + +ERROR_IPC_NS="CONFIG_IPC_NS is required." +ERROR_NET_NS="CONFIG_NET_NS is required." +ERROR_PID_NS="CONFIG_PID_NS is required." +ERROR_SECCOMP="CONFIG_SECCOMP is required." +ERROR_UTS_NS="CONFIG_UTS_NS is required." + +# Go magic. +QA_PREBUILT="/usr/bin/fuidshift + /usr/bin/lxc + /usr/bin/lxc-to-lxd + /usr/bin/lxd-agent + /usr/bin/lxd-benchmark + /usr/bin/lxd-p2c + /usr/sbin/lxd" + +EGO_PN="github.com/lxc/lxd" +GOPATH="${S}/_dist" # this seems to reset every now and then, though + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +src_prepare() { + default + + export GOPATH="${S}/_dist" + + sed -i \ + -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ + -e "s:make:make ${MAKEOPTS}:g" \ + Makefile || die + + # Fix hardcoded ovmf file path, see bug 763180 + sed -i \ + -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ + -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ + doc/environment.md \ + lxd/apparmor/instance_qemu.go \ + lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." +} + +src_configure() { :; } + +src_compile() { + export GOPATH="${S}/_dist" + export GO111MODULE=auto + + cd "${S}" || die + + for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do + go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}" + done + + go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" + + use nls && emake build-mo +} + +src_test() { + export GO111MODULE=auto + export GOPATH="${S}/_dist" + go test -v ${EGO_PN}/lxd || die +} + +src_install() { + local bindir="_dist/bin" + export GOPATH="${S}/_dist" + + dosbin ${bindir}/lxd + + for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do + dobin ${bindir}/${l} + done + + cd "${S}" || die + + newbashcomp scripts/bash/lxd-client lxc + + newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd + newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd + + if use apparmor; then + systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service + else + systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service + fi + + systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service + systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket + + dodoc AUTHORS doc/* + use nls && domo po/*.mo +} + +pkg_postinst() { + elog + elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," + elog "including a Quick Start." + elog + elog "Please run 'lxc-checkconfig' to see all optional kernel features." + elog + elog "Optional features:" + optfeature "btrfs storage backend" sys-fs/btrfs-progs + optfeature "lvm2 storage backend" sys-fs/lvm2 + optfeature "zfs storage backend" sys-fs/zfs + elog + elog "Be sure to add your local user to the lxd group." +} diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest index 2b21e4ccc05e..34b8cffd7029 100644 --- a/app-emulation/protontricks/Manifest +++ b/app-emulation/protontricks/Manifest @@ -2,5 +2,5 @@ AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9 DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64 EBUILD protontricks-1.4.1.ebuild 1413 BLAKE2B 95ebee3c6b4b1b68b72b5ba0eb3daf7b49baae9eb3c7c2f1f8de0781f17dfbb9b190c4c4751cf98520401e93529fe5b43734a76515138592cdc77f922e50bc8c SHA512 2c0d1a4b403313e4a14158319cf90ce4056d03685e082169452fb4424e1eca025305112c647a5b118ba2168ca035b9b0a53221e3a1a0411176c8c1d569e24ed3 -EBUILD protontricks-1.4.3.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728 +EBUILD protontricks-1.4.3.ebuild 1442 BLAKE2B a1656810ec6810c0899349e7a03835a45a92183799d0a39e4257c551208a4a589211127e6b3087d4a7c68024eebd6a54be841a13e6c25c1b0a51e0b755a1e90e SHA512 9b9a9d1de030e9e7e2574295e3ed054c90a36237c462024e2a8996082e088a903a535d27a8f45742345bba6edc84ee476d0639ff60e1411045ef165dfc4c6374 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae diff --git a/app-emulation/protontricks/protontricks-1.4.3.ebuild b/app-emulation/protontricks/protontricks-1.4.3.ebuild index 8aa78e9acad1..b09334a725c5 100644 --- a/app-emulation/protontricks/protontricks-1.4.3.ebuild +++ b/app-emulation/protontricks/protontricks-1.4.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+gui" RDEPEND="app-emulation/winetricks diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 2b8381ecba0c..c4cb90780387 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -19,7 +19,7 @@ DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3 EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06 EBUILD qemu-5.2.0-r1.ebuild 25165 BLAKE2B 719c716e10dab3e845e15497eaace296318d29987efd8f6f8eb1f1ece9d82138c442c1bbb600516f8aaab2886c52caad69006d06bdff39cc90fe772810a9a9c7 SHA512 5be5db0d809ded76014ddd863915ccfb5d8dec0154c1bea2720d8e06a007f882cc6fdc451b18ce2db39b58dd8e3f3e501bd074edb4690a47c3c17bb3a070a46e -EBUILD qemu-5.2.0-r2.ebuild 25349 BLAKE2B d8de8d084b2d83df2deae8d6245ad6f3f4a851c721d2169112a241233b423c7ba139daf95d7fb9bbd8bdbbe92047e0c152cff369daa64f46b624bcd7bc94aca7 SHA512 766a1be55d9b676990d8bb5c14236ad0091ef210b706041da2c5f672b3416745b2e745c7122b69c53817ccc65f9fa34ee483c49613417dcd61261e8e2fbb53ae +EBUILD qemu-5.2.0-r2.ebuild 25346 BLAKE2B f24ae658c04435b88982aa96445ea6037c337125ddc8dcd1067f6bd5c142d5b6cc9c4035d9c62e849abbe9135115d53ad53f1c1ce23bb1b2c82e00ca19ebd253 SHA512 0f4b343844aee4942a491efc18893a5bc63545fad04c8c0583b51256fbd0be4b3a0f16281ab45877fe98f57cc77935fa8e6714bfc67928d5c583125569072ac9 EBUILD qemu-5.2.0-r3.ebuild 25349 BLAKE2B 6e5d1270efbb846cab4b21aea6bc864ad9aa19059bb4a60e7ab120c9243b9db6ebd7e26364054f875438d511ef3ebb68e5f7c1bc6dcf5f9d302f374344a4af52 SHA512 64004e9efc5afc945f96f21ecb05241da109ee89bd265f54977f2fe3f3a9bba9c429eeaf5696ffc51201f07086cdaaa8ae1bc74886d80bd5a76baf3c55124b65 EBUILD qemu-9999.ebuild 25305 BLAKE2B 1c4bda060af3bca672dc7df26b9deef8078217878e14cbe943224f1b52289a4091fe055af6eddcf5a810656af5f51efc1cc7a804313b30ffda5546840bc0b3ef SHA512 282ee0b547ce3c6d077ae32d23b02319f88650defbcfa92445c6d102d3c6e7e65880443b6334d7e32db8ec455f8c4100e52b39cdf640ded3baaece5090b632d8 MISC metadata.xml 4458 BLAKE2B 522818589e668292cbb756008eba7c9f6e0fac36c8d777f0490a1f66cecf576760947a8d94cf03e22af9c9da1d57e25b533c62ee73e9a4fb6da01a6d25c5db03 SHA512 3e054a17a0c86b4ddec0407d44967954170bbb030cea20de6c6841c057bd7e5c2b1b9013e3c0951db9ee570edbd9e7c433e5e3893f7bd762d44b35f9a1fae7db diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild index 8de809e7cd88..ead6c2bb774f 100644 --- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest index c0d121ca40a9..8aa0d1e123d5 100644 --- a/app-emulation/runc/Manifest +++ b/app-emulation/runc/Manifest @@ -1,5 +1,7 @@ DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7 DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40 +DIST runc-1.0.0_rc93.tar.gz 2132429 BLAKE2B 35d6fe9eebd26fb37d648a67b35415c51283ac3dff0f111e88be9120cf139e4811ab9a7b98e2c559dc4ce8b0e7958f15464dc4f039f7b3eb9f06f26a1776875f SHA512 087becdf3882818b7c8d05ac0192928695b35033d72e5ce584d5b8291310f4ba35b1cc78299fc8f17dc7ee425a94817b989890f4108444cc3c45927740b2d378 EBUILD runc-1.0.0_rc10-r1.ebuild 1837 BLAKE2B ffc28565f2daf8dbda38f643dfb2bd26596531a19b3087a17a3f59a9c535080ac93c530c21055716a5d4c36211a62e3aecce74ed385a0446bb47784bd49e8420 SHA512 cdceb2bf1583bdb678da403a3e47bd4cdcdf1af081889ca36da0bdf606e93d477950e1e8e58d51d7d36d78a4a7f482bdc49e677f106f53e8d4326fbc2e56b820 EBUILD runc-1.0.0_rc92.ebuild 1775 BLAKE2B 0a82eb9eb4e9b70cf4679da76b9cc81a9bddfadd3137c905f46fa551e68d2b6f75adc72de725178675f77e73ae3f5b4c6d88b3c8355f7d7c23b657cd8f96613c SHA512 3fed1c9dc08706ec96d5315888b04f2558d2f004b8af595f74b2b0aa384b63c624144bf793ce3e6547975e536d919da3c2e949e3d42dba3d0b3b107fed76b664 +EBUILD runc-1.0.0_rc93.ebuild 1712 BLAKE2B 042989a2156ed211ee4da27c27e9a429feec94e62fe14d7d5d651de2be7a1de037634c86d6b9f51ee936eb00c5d2165b29db364fa25299f00e997c9269019f68 SHA512 63e044ff01f9eb9491f6fc3e42b6b2b102fac1e2854ad41466d37e2bccf047af3246b00fb79f18e057dd874e6d638c890ece42677a28a7bd7cdc23632ce6c17d MISC metadata.xml 876 BLAKE2B db5667a946ce043848f7cf87bcaa8c03594e9c4c35186fc905befd344202028742ab51a783751629086fc79cc3d6ee0d5b316978b2aa8677d6f47bd167fdca99 SHA512 0ad802b914d57523092f574450357bf90d54bce93d22e217061fce2817f68a43e5fd3402f80820c2b5e33ade763cb91ddb261250bfddf8ec4785e457981d69f0 diff --git a/app-emulation/runc/runc-1.0.0_rc93.ebuild b/app-emulation/runc/runc-1.0.0_rc93.ebuild new file mode 100644 index 000000000000..f89d4a1ce278 --- /dev/null +++ b/app-emulation/runc/runc-1.0.0_rc93.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module linux-info + +# update on bump, look for https://github.com/docker\ +# docker-ce/blob//components/engine/hack/dockerfile/install/runc.installer +RUNC_COMMIT=ff819c7e9184c13b7c2607fe6c30ae19403a7aff +CONFIG_CHECK="~USER_NS" + +DESCRIPTION="runc container cli tools" +HOMEPAGE="http://runc.io" +MY_PV="${PV/_/-}" +SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD-2 BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor hardened +kmem +seccomp test" + +DEPEND="seccomp? ( sys-libs/libseccomp )" + +RDEPEND=" + ${DEPEND} + !app-emulation/docker-runc + apparmor? ( sys-libs/libapparmor ) +" + +BDEPEND=" + dev-go/go-md2man + test? ( "${RDEPEND}" ) +" + +# tests need busybox binary, and portage namespace +# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox +# majority of tests pass +RESTRICT+=" test" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_compile() { + # Taken from app-emulation/docker-1.7.0-r1 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') + -L${ROOT}/usr/$(get_libdir)" + + # build up optional flags + local options=( + $(usev apparmor) + $(usev seccomp) + $(usex kmem '' 'nokmem') + ) + + myemakeargs=( + BINDIR="/usr/bin" + BUILDTAGS="${options[*]}" + COMMIT=${RUNC_COMMIT} + DESTDIR="${ED}" + PREFIX="/usr" + ) + + emake "${myemakeargs[@]}" runc man +} + +src_install() { + emake "${myemakeargs[@]}" install install-man install-bash + + local DOCS=( README.md PRINCIPLES.md docs/. ) + einstalldocs +} + +src_test() { + emake "${myemakeargs[@]}" localunittest +} diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest index eb1b94543840..5303c2915cfb 100644 --- a/app-emulation/spice-protocol/Manifest +++ b/app-emulation/spice-protocol/Manifest @@ -1,4 +1,6 @@ DIST spice-protocol-0.14.1.tar.bz2 73444 BLAKE2B 12050c38ee3d24814b57a340a88423352edae6412b5a20e27d59b7235e753f51aaf757f7e9e6ce702d0b0c0afeadfde7f3937725ae4715ae4dc4da20ee7fd663 SHA512 88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482 +DIST spice-protocol-0.14.3.tar.xz 22224 BLAKE2B 32e69c56ea78e21cf2ff9474e34908eababc1dd9667cd8be24c973e9ff006e1a14f55dd23ab16c40d7bcb5bd7f00392edccdd3512218928787ad9162a6519f1c SHA512 9e35fd0d9be14074a482bdb20fe6954e5f0a616d0ad60da63a065435df2b169ec134a95d5756df73e2606c7497c9bf0427023d4e5ebfbb1abb181cf8020879a6 EBUILD spice-protocol-0.14.1.ebuild 389 BLAKE2B 499cabe06ee6ea7c989ffd1a03c7ff57442f0317527ebad33637fe3688fd3e857406b8283cf1876719c2828f3386fe3b777fb668fb3f5f4b8df21a499c640926 SHA512 3a7acc22a6e8ca837fd7c279a77190e06d5af7b6f0eaccd183cac591b79745c0c63aa5e3ff24bfeeb1887c382ed966c3d28aa644476a8d8b944e0890f184dc2c +EBUILD spice-protocol-0.14.3.ebuild 377 BLAKE2B 23026b564be6062728ef38102765249685dae898a4e4ce584996529d57a0a2bec16869024a06d8a696160fda8a133940b5461c5a1ec41d3cd8b3b18d84d9f992 SHA512 e13b167262f9b3f8ed6a61488e21e9c50a0dd151e9b73e97f32e672be947bf84c9843bbf3d4afd194e9a42fbdad7e68c25a9b58e982f79479b0be1737f75214b EBUILD spice-protocol-9999.ebuild 553 BLAKE2B d08a20664a23a34bd2ea047a6165d53fd14222de4617d832a4a599f519acbb8215868fe1e19ae11f2f4fe56965b8183f3b5a4ed715ee39203fc888061ab9c932 SHA512 dba54afe71f0552a24f6beb53c7d87dfe5ffd8d885f048de3f5eff81ec31fd899d1ff67b976c43e631d599798ef3a935ba4b760fa0aa5ad6b67e358bd3fdc230 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32 diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.3.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.3.ebuild new file mode 100644 index 000000000000..e5df1c3924f4 --- /dev/null +++ b/app-emulation/spice-protocol/spice-protocol-0.14.3.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="Headers defining the SPICE protocol" +HOMEPAGE="https://www.spice-space.org/" +SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index 753f8cf382b0..452ec3a55fb5 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,11 +1,12 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd AUX virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch 3237 BLAKE2B 5ebd53475768d4611ce9a23f8b11ad92246f561933c67a620136adcd4c7f5d1cf12cd09360eb6676221725c3732c255fcb1fe2a177fce9d007db83c776c5b202 SHA512 046e4c8e2d8f295d8e7c29c7dea53b8db18700f2ba03c7ab67ff466850f1cb2ed0dbc22aacd78b8c7011e3fb2dc02be06aba1678d1930b947988ddacf74e9174 +AUX virtualbox-modules-6.1.18-binutils-2.36.patch 1930 BLAKE2B 8cdb1564f9ac3bcfd7b73a7e991a3594ee53338692f54c83522ef6c5a7ce14207d6e57290c75a37004025518ecc998332a25216aab6044381628c5f02d580e22 SHA512 a1b6cc713b9ec92095e82450546678ff06a2099757cfed8c2b8257c04a50ea1016eafc69241efc1bf17cad506036615f5943c50fb8e162df113e9495548f6925 AUX virtualbox-modules-6.1.18-linux-5.11.patch 425 BLAKE2B b81f2c577732c51f92b524271e44f6c9763b8fd91b78e7eba977905e7e92ce6de931c05cf97d7502eaeece29c89fa3e29a419a9203b81b7ca245e11c144e2413 SHA512 896c1313c43d7917d58fcf227ac43ec6a1f1369ad5271e6184226347da680f4c0e97aea30c882b455964e7c08b342703f7d4b688cda743ad6249931256807b7a AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342 EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2 -EBUILD virtualbox-modules-6.1.18.ebuild 1491 BLAKE2B 3a03609d891215b3d14dbd8230b3f0de173e52c91ec897a7e4304e275edf103db16a1d246c8a0fca0c381c7bac11609979d98910e522e11c70a0720cd46b105d SHA512 32c9746599ec88fffe2288d89775c1994e0c082d83b71a853b04d4dcb7ac663303fdb43b09ed940af328a32fb282723b53f0cbf897f3fbc8e0b67ef87241c993 +EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B bc820f78c75b9057944568dd06b06a544f887c7aa8bf026e1907e9b898a7c10638069aa95a38e701ae0422d541d9aa045b109a40faeac1ddef7365f850acbeb5 SHA512 a4f08b633a6e4a5c22dbd7cd088c509e7e5c8658bc3b9604b4ebf77bb2edc70491ebc3eabfa414ae4bd174de36579aaab10226810f7df525691115ecbccaa042 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000 diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch new file mode 100644 index 000000000000..2eaeb1ea3380 --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.18-binutils-2.36.patch @@ -0,0 +1,39 @@ +--- virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c ++++ virtualbox-modules-6.1.18/vboxdrv/SUPDrvTracer.c +@@ -1472,29 +1472,32 @@ + __asm__("\ + .section .text \n\ + \n\ +- .p2align 2,,3 \n\ ++ .p2align 4 \n\ + .global SUPR0TracerFireProbe \n\ ++ .type SUPR0TracerFireProbe, @function \n\ + SUPR0TracerFireProbe: \n\ + "); + # if defined(RT_ARCH_AMD64) +-__asm__(" \ +- movq g_pfnSupdrvProbeFireKernel(%rip), %rax \n\ ++__asm__("\ ++ movq g_pfnSupdrvProbeFireKernel(%rip), %rax \n\ + jmp *%rax \n\ + "); + # elif defined(RT_ARCH_X86) + __asm__("\ +- movl g_pfnSupdrvProbeFireKernel, %eax \n\ ++ movl g_pfnSupdrvProbeFireKernel, %eax \n\ + jmp *%eax \n\ + "); + # else + # error "Which arch is this?" + # endif + __asm__("\ ++ .size SUPR0TracerFireProbe, . - SUPR0TracerFireProbe \n\ + \n\ + .type supdrvTracerProbeFireStub,@function \n\ + .global supdrvTracerProbeFireStub \n\ + supdrvTracerProbeFireStub: \n\ + ret \n\ ++ .size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub \n\ + \n\ + .previous \n\ + "); diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild index bbc7f312dbe5..17dbf76a1d40 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild @@ -31,6 +31,7 @@ MODULESD_VBOXNETFLT_ENABLED="no" PATCHES=( "${FILESDIR}/${P}-linux-5.11.patch" #762994 + "${FILESDIR}/${P}-binutils-2.36.patch" ) pkg_setup() { diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest index b78fe113ecd7..7877875d5a42 100644 --- a/app-emulation/winetricks/Manifest +++ b/app-emulation/winetricks/Manifest @@ -1,7 +1,7 @@ DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588 -DIST winetricks-20201206.tar.gz 690966 BLAKE2B 8304d64657fdd921974f0c326bb4e0e1d859a69e573a7387c945c7dbfd20540621cc9c89718069b569309ac2358872083d651d29ddce616d1c2cf9a12ed39943 SHA512 6965bea9bc8bb212fe2b851a53dd144c52b37466cd0d6d6a933e4e0c16b202647f1b19804159642ce9fda566872ca51e8326e8716fafdea43cd09f24ed6b4a25 +DIST winetricks-20210206.tar.gz 690837 BLAKE2B a1d068e9659f6b176873af49994f1e0ca884eaa1ac9b8f5dd6d7abe79a2b8b827a2334efa7862547b17cca5bcfc285ce2d65ac0e5736cddcc777d4df2dbc7af9 SHA512 57f2ce5fe531eb6ee9a578ca565fadf5ef2e6e1379abee640ee9dc0d6000c92ce983c7507002bc6ace613d6d0dd03260ede11f7bf267adf19eb67900a0449f58 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a EBUILD winetricks-20200412.ebuild 2051 BLAKE2B d37bffe1f2386eb52a2cd1697b7e9c8ea67807ac400fa4474b22e76a83aeeae04176215d9fa64845e1627723d9ba3c18c03c6b0e020e1db3a50fb04ce378e50b SHA512 bde6f11832da7d9efcbdf226ed7f37b9a2b7da1eb79001dc00ea398c5eadc41f0bc5821d19cbdbf9a1c4df80a395dc5cf718b2e51ad051a64141a41758eacc5e -EBUILD winetricks-20201206.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c +EBUILD winetricks-20210206.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c EBUILD winetricks-99999999.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c MISC metadata.xml 713 BLAKE2B 7d9673350201c49de4651ecb8975ed21387259f3375c1b531b63b2a0e0e65f0b2540806db5f6d1d47953911ca36b0d06bf8edaa57ad5e546d242eebcd96f869f SHA512 2a4c5a6ecfc558f3c7382538b8701ab95c3d771a02c51f5dae852a0e90b7df51be65200b337bcc3c92ef9bf827c23954097b3b5e8c99004db729ed6d77e64cfc diff --git a/app-emulation/winetricks/winetricks-20201206.ebuild b/app-emulation/winetricks/winetricks-20201206.ebuild deleted file mode 100644 index 89dcbb57c973..000000000000 --- a/app-emulation/winetricks/winetricks-20201206.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -wtg="winetricks-gentoo-2012.11.24" - -SRC_URI="${SRC_URI} - gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 ) - kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 ) -" - -DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine" -HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="gtk kde rar test" -RESTRICT="!test? ( test )" - -# dev-util/shellcheck is not available for x86 -RESTRICT+=" x86? ( test )" - -BDEPEND=" - test? ( - dev-python/bashate - dev-util/checkbashisms - || ( - dev-util/shellcheck-bin - dev-util/shellcheck - ) - ) -" -DEPEND="" -RDEPEND="${DEPEND} - app-arch/cabextract - app-arch/p7zip - app-arch/unzip - net-misc/wget - virtual/wine - x11-misc/xdg-utils - gtk? ( gnome-extra/zenity ) - kde? ( kde-apps/kdialog ) - rar? ( app-arch/unrar ) -" - -# Test targets include syntax checks only, not the "heavy duty" tests -# that would require a lot of disk space, as well as network access. - -# This uses a non-standard "Wine" category, which is provided by -# '/etc/xdg/menus/applications-merged/wine.menu' from the -# 'app-emulation/wine-desktop-common' package. -# https://bugs.gentoo.org/451552 -QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop" - -src_unpack() { - if [[ ${PV} == "99999999" ]]; then - git-r3_src_unpack - - if use gtk || use kde; then - unpack ${wtg}.tar.bz2 - fi - - else - default - fi -} - -src_test() { - ./tests/shell-checks || die "Test(s) failed." -} - -src_install() { - default - - if ! use gtk && ! use kde; then - rm -r "${ED}"/usr/share/applications || die - rm -r "${ED}"/usr/share/icons || die - fi -} diff --git a/app-emulation/winetricks/winetricks-20210206.ebuild b/app-emulation/winetricks/winetricks-20210206.ebuild new file mode 100644 index 000000000000..89dcbb57c973 --- /dev/null +++ b/app-emulation/winetricks/winetricks-20210206.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git" + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +wtg="winetricks-gentoo-2012.11.24" + +SRC_URI="${SRC_URI} + gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 ) + kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 ) +" + +DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine" +HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="gtk kde rar test" +RESTRICT="!test? ( test )" + +# dev-util/shellcheck is not available for x86 +RESTRICT+=" x86? ( test )" + +BDEPEND=" + test? ( + dev-python/bashate + dev-util/checkbashisms + || ( + dev-util/shellcheck-bin + dev-util/shellcheck + ) + ) +" +DEPEND="" +RDEPEND="${DEPEND} + app-arch/cabextract + app-arch/p7zip + app-arch/unzip + net-misc/wget + virtual/wine + x11-misc/xdg-utils + gtk? ( gnome-extra/zenity ) + kde? ( kde-apps/kdialog ) + rar? ( app-arch/unrar ) +" + +# Test targets include syntax checks only, not the "heavy duty" tests +# that would require a lot of disk space, as well as network access. + +# This uses a non-standard "Wine" category, which is provided by +# '/etc/xdg/menus/applications-merged/wine.menu' from the +# 'app-emulation/wine-desktop-common' package. +# https://bugs.gentoo.org/451552 +QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop" + +src_unpack() { + if [[ ${PV} == "99999999" ]]; then + git-r3_src_unpack + + if use gtk || use kde; then + unpack ${wtg}.tar.bz2 + fi + + else + default + fi +} + +src_test() { + ./tests/shell-checks || die "Test(s) failed." +} + +src_install() { + default + + if ! use gtk && ! use kde; then + rm -r "${ED}"/usr/share/applications || die + rm -r "${ED}"/usr/share/icons || die + fi +} -- cgit v1.2.3