diff options
Diffstat (limited to 'app-emulation')
27 files changed, 645 insertions, 195 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 15f2612fa68f..3834667b2a50 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest index a63584b84d00..714f4ad0c0f9 100644 --- a/app-emulation/crossover-bin/Manifest +++ b/app-emulation/crossover-bin/Manifest @@ -1,3 +1,5 @@ DIST install-crossover-20.0.4.bin 221436226 BLAKE2B 486494455759d92f8e7e5d35968a603e41a0674cb0752e7d5ba4893d33e77b3e31fea2ebe75d471e2478e7f3cce9be2f712840f1f50bfe790fec5ec936b804a5 SHA512 78252d29f8a72a8742d57a65a60d09a81a70a98517b67468dac96af94ee8af7a313f164af6717f9a9c657095e66466809e08584c7a0fde3bd58c27ff00f41067 +DIST install-crossover-21.0.0.bin 312441596 BLAKE2B 4431f545e6a8c8bbc1ab5cf0f46d019242b48c61a2edfc7a762e38718d6543ce384ad55b40f3470f11893adcb6801323db5dba846cc0b544d6dab5e5bfb24e2b SHA512 c5567eef346d93af22f996be2a5a0237bc299c54cba3aa9a1345854b0cf601ffd26975536d18175735c170411b572a59d5dadb39674bfe158ca9944595e4deed EBUILD crossover-bin-20.0.4-r1.ebuild 7651 BLAKE2B b30aa79900d12cf469a5a12c854c7a3158f7671b6cc83adba9a39bcbc996708b5ade8b34e79631702390bf0de91c29ac85293185bb04fc9e27224e9a4f82e40d SHA512 5dd675da9398c20bba21d077d48a19ccb4dea3f5888f402120b4574ec324fa559cad8930d0b649dd75d4cf284f6890ca95033d227ae0c0af22fc28cc4bd1bdb1 -MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d +EBUILD crossover-bin-21.0.0.ebuild 7552 BLAKE2B 116a19b0cef631ad98225895e46694bdd61efd2c0b1120ab5ee48e20f3c35d566703bddc10280d381982062435cd3c3c939a40cc11fd3132fdf47c34e39953cf SHA512 d0c47414d959e3af22ce118d9b10f754351bd5e21c14c197f38183defac55043e5b65b039a6715c5ae2f40303d45babc79ba6eb52f835c9f4a22b544ab3b9af6 +MISC metadata.xml 567 BLAKE2B d0ae14d461fe896694458100941e606ad77db6493e1f0b8ac39723ce7fad4970859c3cc38cdf0bd8c621ffbc98ba4104ad7a253e1fd4c1a54a623c65ac5c25c3 SHA512 cf88f42103f16e182d6bdb5017278b1a1925c5ac2c7557ca043741ccc4a3e1a7825217e5a8c2785fc44151e972ff156b05037aab16e4245adfe55a838604f724 diff --git a/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild new file mode 100644 index 000000000000..b6892fa15c0b --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild @@ -0,0 +1,224 @@ +# 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/vkd3d-compiler + 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/cpio + 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] + || ( + sys-libs/glibc[crypt(+)] + sys-libs/libxcrypt[compat] + ) +" + +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"* \ + || 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 + + # Remove libs that link to openldap + if ! use ldap; then + rm "${ED}"/opt/cxoffice/lib*/wine/wldap32.dll.so || die + fi +} diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml index 5c532a244c89..65e715693e51 100644 --- a/app-emulation/crossover-bin/metadata.xml +++ b/app-emulation/crossover-bin/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> +<maintainer type="person"> + <email>pacho@gentoo.org</email> + <name>Pacho Ramos</name> +</maintainer> <use> <flag name="capi">Enable ISDN support via CAPI</flag> <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest index 70212b3d5402..07304e3fb5f7 100644 --- a/app-emulation/crun/Manifest +++ b/app-emulation/crun/Manifest @@ -1,5 +1,4 @@ -DIST crun-0.18.tar.gz 1394857 BLAKE2B db4f0407aaf5e4c5b9069ad5ae6a76308665d91559d92bf370b964e0914f337a84af896f1c1e00184ef4b0625bd1c0f1e2fc3295074c7f5524c5359ce54ba6b4 SHA512 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46 +AUX libcrun-linkage.patch 1155 BLAKE2B b815ada4c90e61ac36e878ba0072f2dc3944e8f82d827e47cc8907fce0931e2134af690261cf75e193fbcb47b4822955d26f3e9950b674c5fafde85f25700032 SHA512 2a1936f3ac3a45cc2fcef61d097c86c78e94ee71ff15dc68d6037bf6be174a6bff725c04ccefff805c9059db3e4db1285c785658b7f6cf4b610739f11e82cfed DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994 -EBUILD crun-0.18.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113 -EBUILD crun-0.19.1.ebuild 1391 BLAKE2B 12467ff7c6a8537132ed36cdb5113258c51c60242cb575429725d51759724b6eb3c4ab8915e21ae85e77aa2371c8897763087915c7906fa85719b377796394e2 SHA512 201aee36f5243014988103b8ae3f29e600cd10fdd68f413aa4b1eba371cd30646d73367de1a23e7a9ead4b41b3e1facc44a2f62f730489582c02a79b6cbdae51 +EBUILD crun-0.19.1-r1.ebuild 1511 BLAKE2B 56dc3607cfccf765c0be5357df9d51f43ad397359f82ce600eeefd39ee03cae12f96a44bcaf22c5f41a538991e577e2f1ff8cc44adf5e711ae869f5cd47e8fc5 SHA512 314589e661a047094b5eac396ec5c982d6b9f2bc25d63fb43e53a6420a4ccc2568fffc476d1a8777dca6bbf2511de16e37e52c28d29b67e9171381db74710857 MISC metadata.xml 1299 BLAKE2B cfa5ced999f15c2aabb6633865fb8bc2f2dc7c2d2b4fa61780de40f975c8a00ad87d7c1251517f7a50b01c3413d2afbe8bca2114ce9eb74d0437285ee6d19d91 SHA512 0f2109b828550df8807736022598f3fa36128ff5224aa61cbb4001689c344b670c124bb85805cdedf8b2e7173b4cc6bc29d7d46ef95f7c9f03c4a9b6e1c93493 diff --git a/app-emulation/crun/crun-0.18.ebuild b/app-emulation/crun/crun-0.18.ebuild deleted file mode 100644 index bc97b2bddb13..000000000000 --- a/app-emulation/crun/crun-0.18.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools python-any-r1 - -DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" -HOMEPAGE="https://github.com/containers/crun" -SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="+bpf +caps criu +seccomp systemd static-libs" - -DEPEND=" - sys-kernel/linux-headers - >=dev-libs/yajl-2.0.0 - caps? ( sys-libs/libcap ) - criu? ( >=sys-process/criu-3.15 ) - seccomp? ( sys-libs/libseccomp ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} -" - -# the crun test suite is comprehensive to the extent that tests will fail -# within a sandbox environment, due to the nature of the privileges -# required to create linux "containers". -RESTRICT="test" - -DOCS=( README.md ) - -src_configure() { - local myeconfargs=( - $(use_enable bpf) - $(use_enable caps) - $(use_enable criu) - $(use_enable seccomp) - $(use_enable systemd) - $(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '') - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C libocispec - emake crun -} - -src_install() { - emake "DESTDIR=${D}" install-exec - doman crun.1 - einstalldocs -} diff --git a/app-emulation/crun/crun-0.19.1.ebuild b/app-emulation/crun/crun-0.19.1-r1.ebuild index 36091c997004..0590fee263af 100644 --- a/app-emulation/crun/crun-0.19.1.ebuild +++ b/app-emulation/crun/crun-0.19.1-r1.ebuild @@ -36,6 +36,15 @@ RESTRICT="test" DOCS=( README.md ) +PATCHES=( "${FILESDIR}/libcrun-linkage.patch" ) + +src_prepare() { + default + + # for libcrun-linkage.patch + eautoreconf +} + src_configure() { local myeconfargs=( $(use_enable bpf) diff --git a/app-emulation/crun/files/libcrun-linkage.patch b/app-emulation/crun/files/libcrun-linkage.patch new file mode 100644 index 000000000000..72156ac931c8 --- /dev/null +++ b/app-emulation/crun/files/libcrun-linkage.patch @@ -0,0 +1,29 @@ +From 7cfdf094071fcff038bab573c1eeee599fa17b16 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Mon, 2 Aug 2021 03:53:25 -0700 +Subject: [PATCH] Makefile.am: link libcrun to $(FOUND_LIBS) + +otherwise libcrun consumers fail at runtime with +symbol lookup errors + +Closes: https://github.com/containers/crun/issues/711 +Issue: https://github.com/containers/crun/issues/340 +Downstream-bug: https://bugs.gentoo.org/717750 +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 150e933a..7e5a4406 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -46,7 +46,7 @@ libocispec/libocispec.la: + + libcrun_la_SOURCES = $(libcrun_SOURCES) + libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -fvisibility=hidden +-libcrun_la_LIBADD = libocispec/libocispec.la $(maybe_libyajl.la) ++libcrun_la_LIBADD = libocispec/libocispec.la $(FOUND_LIBS) $(maybe_libyajl.la) + libcrun_la_LDFLAGS = -Wl,--version-script=$(abs_top_srcdir)/libcrun.lds + + # build a version with all the symbols visible for testing diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index a9f9841fe0d1..d3d7be4cc8e5 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,7 +1,5 @@ -DIST diskimage-builder-3.11.0.tar.gz 475123 BLAKE2B 2d286193c99077b943ddc2342871878d78380c27b247cca895d14e9ca1ca69c3d260fe0061e9f09a80156cee327234ce0a8c129f2008422d0db1bd736175f490 SHA512 083a3dff0ec32cd35cb5a95f25b115778aa4b74ab47796c13ac007fa6af5940140117eb4c2b5f44674316f65b0c0b53b6e077787e8018f6d7735906d333d2da0 DIST diskimage-builder-3.12.0.tar.gz 477540 BLAKE2B 9facf1d6ef9a38b960b7bcc8ee035d8f7ae6c5189d1de25e335d68a6e8389be0ab0f3b787e5d5112ee7ef508b583d1df612ca75149659f78685a2fdf6dee21a7 SHA512 edec229023673c48a3176b315c9d84067b4e7b4a30843839722a7ce300f898d92ee5f5146b6d92f2eda692bada4370b32f1b19f3b929a379b3e604b6e7ce29d6 DIST diskimage-builder-3.13.0.tar.gz 494027 BLAKE2B 27a88118d688018a5f842e0d483e3128b0715cdc21f33308de61ea5077ad1b824738363ae066463e84e7e3821a36085afc9985fde74883ab040c67a25073e5c0 SHA512 7b099811021f199ed0680e2dc4db6302b05dc6adf95ac96e890501cf92727dc319fbf96f9c68a8b9bca26ba54d7ff5e6a67f036a9d86a3ad1752d5cc4a8edbaf -EBUILD diskimage-builder-3.11.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d EBUILD diskimage-builder-3.12.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d EBUILD diskimage-builder-3.13.0.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92 EBUILD diskimage-builder-9999.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild deleted file mode 100644 index 7a9c76c9cccd..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest index e1458ddcb309..3147e49cb229 100644 --- a/app-emulation/docker-cli/Manifest +++ b/app-emulation/docker-cli/Manifest @@ -1,3 +1,5 @@ DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f +DIST docker-cli-20.10.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0 EBUILD docker-cli-20.10.7.ebuild 1846 BLAKE2B a05d7129af51396d5da5017c9bc15a4229ebe3f56aa1afc8d92ee58c8e00b22d4e9baf42274b8e268dc00a3e417fd5435e3aac6da46a5b1e37a4909b4c736da6 SHA512 592eecad2f2e76c1bb9283e22a146983035e14ab481b867388c0ff2a0c0692592d88186f5007dd01c7c35e0bceb93143b54369bacce39f73fa40417345da1057 +EBUILD docker-cli-20.10.8.ebuild 1843 BLAKE2B c4a0dc3207b689759c37bcbd1acc4fc12fecda6a5fb46f09d04ec9a52188e038554a574467f86151644d67521798cebf2879c89414aa0e9ef4c06e8e753ce238 SHA512 2da1842e1e74794bfc7abdd5e46331395c87fd0ca1c2911c71c0ea32a21530e92a878656bf1ddfe913799d8f2704e78d8512512c5dbf1d5314c30ebef9e44e41 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 diff --git a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild new file mode 100644 index 000000000000..d298b0daa2c0 --- /dev/null +++ b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GIT_COMMIT=3967b7d28e +EGO_PN="github.com/docker/cli" +MY_PV=${PV/_/-} +inherit bash-completion-r1 golang-vcs-snapshot + +DESCRIPTION="the command line binary for docker" +HOMEPAGE="https://www.docker.com/" +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="!<app-emulation/docker-20.10.1" +BDEPEND=" + >=dev-lang/go-1.16.6 + dev-go/go-md2man" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die +} + +src_compile() { + export DISABLE_WARN_OUTSIDE_CONTAINER=1 + 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${ESYSROOT}/usr/include" + export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)" + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat VERSION)" \ + GITCOMMIT="${GIT_COMMIT}" \ + dynbinary + + # build man pages + # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + mkdir -p ./man/man1 || die "mkdir failed" + go build -o "${T}"/gen-manpages ./man || + die 'build gen-manpages failed' + "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 || + die 'gen-manpages failed' + ./man/md2man-all.sh -q || + die 'md2man-all.sh failed' +} + +src_install() { + dobin build/docker + doman man/man*/* + dobashcomp contrib/completion/bash/* + bashcomp_alias docker dockerd + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completion/fish/docker.fish + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* +} diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 177188d6afee..aed31a5df7d5 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -16,5 +16,5 @@ EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd EBUILD docker-compose-1.29.0.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96 EBUILD docker-compose-1.29.1.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96 -EBUILD docker-compose-1.29.2.ebuild 2101 BLAKE2B 321441c284627fb092af9b0d75c3a9faf34f4fb368afdbd90b3735603798acb25f9e664d5e28a7bce84ea27c38adf456ae1b53d067d39007caa4978a4c346b6c SHA512 2fcc39f7d27a0b06d3d7c97ba1b20e519d89014bb891b3634e2023c3efa54b0db633d7131f5c9d4a5c863d4dfdd074d6cd3209b56f76cd9a7b0a96eefd83d265 +EBUILD docker-compose-1.29.2.ebuild 2100 BLAKE2B 001ac61eb752613830383b163de93a6e0aa46cbfee4246e0cee2466f34a9afc92cf875269beea32da75fe642fcb3685c855b6d6618dcf6cb5e32f4e1c1ac14ff SHA512 18609cbce12c59bedcbb8b3039a64cd6ebfe7bc63e2f55a56f493ceedf5590a262b2170e521a51fe387a7e236c80b45d1c0b729fa1fedbb016babdd7f89d8888 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e diff --git a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild index 8e60fe4c7510..cec99a23828b 100644 --- a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64" +KEYWORDS="amd64 arm64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index bd59e45544ef..ea74743992f3 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,5 +1,7 @@ AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff DIST docker-20.10.7.tar.gz 11077660 BLAKE2B 081b36668ead0fd727ebdabc0d07fdf1992f64e3ab1e7c09933130b37f9ad60876c36d1fcda5619ba1bffac7fadafe63d7fc647868c3c6ba30429487c2ebc31b SHA512 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073 +DIST docker-20.10.8.tar.gz 11080739 BLAKE2B 1e5c14e23c4e9c8b0568cf19c98cb4cdbedc43742357bed61201f0188d5e3f4949d5e2a2231fd89635290c8784678005dff707a4e00ececfb82d88c69d31d235 SHA512 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8 EBUILD docker-20.10.7.ebuild 7898 BLAKE2B c70fd9e392d62c80a69783170a9d48ff0f17b817a5897b86c4bbf26e5e624b6cc62205ceecef1036400cce494c4ea46ced8b7107e1466d41b6295eaf6bce8a2a SHA512 683ceab1c02cb2a2db344a0574baae9673dfb414af2a10a6ea31b8221ed48b36540a510258a1ef8adcb811e093e88e7f948550ee6db2e6c0ae3a98f34dc6f34e +EBUILD docker-20.10.8.ebuild 7900 BLAKE2B 1816d1f86f17064391e484415dcc35a901e205b96b492f5c24f77f18887c9c82b24229bc131815cc2faa070b635adf16bf38c1746adabc89bca717423956bf6a SHA512 35103eef847ac33c0f98e237dceb324b4fec0c65c4b844bd307ac5aae8a567464f2998fd2a4c6d815b21d2eb3f24c9f4123fcf9f36b8827e31e1c68f549d98f2 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3 diff --git a/app-emulation/docker/docker-20.10.8.ebuild b/app-emulation/docker/docker-20.10.8.ebuild new file mode 100644 index 000000000000..827d5a2ed3fa --- /dev/null +++ b/app-emulation/docker/docker-20.10.8.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN=github.com/docker/docker +MY_PV=${PV/_/-} +GIT_COMMIT=75249d88bc +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/" +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.9[apparmor?,btrfs?,device-mapper?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20210525 + 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.16.6 + dev-go/go-md2man + virtual/pkgconfig +" +# tests require running dockerd as root and downloading containers +RESTRICT="installsources strip test" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 +PATCHES=( + "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch" + "${FILESDIR}/ppc64-buildmode.patch" +) + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~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 + ~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${ESYSROOT}/usr/include" + export CGO_LDFLAGS="-L${ESYSROOT}/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 <youruser>' + 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/ski/Manifest b/app-emulation/ski/Manifest index 250ce86ec17d..ebb49617f33e 100644 --- a/app-emulation/ski/Manifest +++ b/app-emulation/ski/Manifest @@ -13,4 +13,4 @@ AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8f AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0 EBUILD ski-1.3.2-r4.ebuild 1506 BLAKE2B 90836a677e69fb8ebf30da8e387f48b440999de416f2924e4e11d0db2a3b36f55b1050a67bf04b3ab86319664cfe8b0493328907debf72c45254ed990d959b53 SHA512 e9c9f64fb7230421a12a910ee4d46e9defe4ee6a9ef85fa8fe47bc9f7a6afa91bc2eb387736639682848b1e01be433f079a08c822c687a30ccd5a5fa66468892 -MISC metadata.xml 445 BLAKE2B 9ed57ae50b2327c0fc3bf69bf2ced1dfa2b069abda5da550bd82d04cdf834fe9e5f2a5089a9e5788c45bdc4312127654d482a9b6edc7a39adb05844705e36099 SHA512 6e91887d446a1d2fec5ab934df8d3cbd629bd905541db8300751f624d19061f8d78ccc632d4d36a8505f2f4e29137a20fb2feb0aad061379ea6e39783bdbef58 +MISC metadata.xml 361 BLAKE2B 386e93e896be1df1f69ac25e6c4c9645166a758dee9b7197afe489b58e27e8545e2d179e0905d61045d4abe61628961da7a46e88323fbeaafc3cfda5194b0e5c SHA512 fcfafc44cbae7ee592da6a5daa5019866eddd3e6b62746614a430e6d2143a4aa5eec294718571654edff52166c9b0d33a5988a262a2167601b92d69e61f9de02 diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml index bdbbdb76bcb8..c50e01e3f45e 100644 --- a/app-emulation/ski/metadata.xml +++ b/app-emulation/ski/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="debug">enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag> </use> diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest index 5096edcf5c7c..ba953fa79c18 100644 --- a/app-emulation/virt-what/Manifest +++ b/app-emulation/virt-what/Manifest @@ -1,9 +1,3 @@ -DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613 -DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820 -DIST virt-what-1.20.tar.gz 459243 BLAKE2B c51bfc4366ba90e32548a5d1e0779fcc1835dae7a6bb2b6f67b4371c2d2e949339aa0ff67d64485cdb03592713a3ae04a6779e4dac0babf08bb268ce6403066f SHA512 edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4 DIST virt-what-1.21.tar.gz 478767 BLAKE2B 7c48b84d9f1fe5f734921f68848b84beee2e5687a6ebfbc422a1349063e6a83c932a89cb2936239da6be033b72e6010694314cf106486cd6c54cd02652bc61a6 SHA512 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717 -EBUILD virt-what-1.18.ebuild 610 BLAKE2B 8e8cacd1b74212ef1aada2102323f86b74ae8c15da54be191757f57182042f2a98c380ed4dd956ecfb61e97c7798570ecf0aa5b83ac4831e3f8a8cdffe18c545 SHA512 b47766c54839bce195ab5e19ff653e2d50d0c920710939fb6fac807a28ad3469ea9da6b9e89ec686106b40ab13317eb53923ed2e1c2c6088a7d03f390f87fd70 -EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9 -EBUILD virt-what-1.20.ebuild 613 BLAKE2B dc561d0ac5a889d5884afc8d2e31793f7571cdd2f26395327e0390bbd3db277c880ae96fe5cc9cf99ea0d86292a9ba77cfb0cc7b7126eee316314156caca63d0 SHA512 8c64ded91856ef2c1246ea3e160f84f822e871c08a09c8e8242c654058bc644bc33225774abe536b264be0c386a615379c16cf91d6f2f89bb7ba072f04ac2619 EBUILD virt-what-1.21.ebuild 607 BLAKE2B c1b875e443bb23ab8496320f5513ee0b0591dda4b33978ffcf0a8a70524c0ec11e8be248d937b11e82e80f44aba547ad4026550231dd5c465196fc543c88855d SHA512 22befae978503d1a5a2dce707de283e8dd95f189bd6fd5af9b644e7063bd1039284ba1543c6f17ed1be2dd3d657c5c89975042f98111d141fe17091c44a8e8c9 MISC metadata.xml 463 BLAKE2B d2aeb047a6f3595cf1f064685fedb75876854c2361c084a909813d07fe7495882f9f6d400a896b3c67f578bae02fe89ec3cf8971478b15200a5486392e13b9d2 SHA512 85f83ce93888eb68982ce585aac6c29cfec62df4a5d76ac483d8946b0efe9dcabba271c7391aaa3c37247b228d06d21cb023efbcbd84cd48cf9733b918991b28 diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild deleted file mode 100644 index 8001d3e820a0..000000000000 --- a/app-emulation/virt-what/virt-what-1.18.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Detects if the current machine is running in a virtual machine" -HOMEPAGE="https://people.redhat.com/~rjones/virt-what/" -SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" -IUSE="dmi" - -DEPEND="dev-lang/perl" -RDEPEND="app-shells/bash - dmi? ( sys-apps/dmidecode )" - -src_prepare() { - default - - # Pretends to be POSIX sh while it is not - sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die -} diff --git a/app-emulation/virt-what/virt-what-1.19.ebuild b/app-emulation/virt-what/virt-what-1.19.ebuild deleted file mode 100644 index bbc7f8023ffc..000000000000 --- a/app-emulation/virt-what/virt-what-1.19.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Detects if the current machine is running in a virtual machine" -HOMEPAGE="https://people.redhat.com/~rjones/virt-what/" -SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="dmi" - -DEPEND="dev-lang/perl" -RDEPEND="app-shells/bash - dmi? ( sys-apps/dmidecode )" - -src_prepare() { - default - - # Pretends to be POSIX sh while it is not - sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die -} diff --git a/app-emulation/virt-what/virt-what-1.20.ebuild b/app-emulation/virt-what/virt-what-1.20.ebuild deleted file mode 100644 index 9c1c37709d81..000000000000 --- a/app-emulation/virt-what/virt-what-1.20.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Detects if the current machine is running in a virtual machine" -HOMEPAGE="https://people.redhat.com/~rjones/virt-what/" -SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="dmi" - -DEPEND="dev-lang/perl" -RDEPEND="app-shells/bash - dmi? ( sys-apps/dmidecode )" - -src_prepare() { - default - - # Pretends to be POSIX sh while it is not - sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die -} diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 0b26b950f7cd..6e770fd8238c 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -5,6 +5,7 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16 +AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d @@ -13,5 +14,5 @@ DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd7 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 EBUILD virtualbox-6.1.22.ebuild 14342 BLAKE2B 8f7472f3cb2b25c9aa9079bc6732ba65c33a67fc166cc28d3dcea83886739cae019f6f5572301b7bde8c1b2c825677b610ba571462a187b3bb1f53cd84dd1bd9 SHA512 cebb5863ef8538ca1d503cd85605f279afb0d46d62f6b1ba343a4af422aceffdbac15e51ee20428f11dbc4361aeef91a59c77c489c08a90dae8709fd39076b3a EBUILD virtualbox-6.1.24.ebuild 14343 BLAKE2B ce8b34283b04367d1bf2c22af58bb0fbae9b513bd82cad3826f989633a40988cc5e57f5360ad02d452f789e8a7c118338ad0deb874cf350c03f397e405b6fe24 SHA512 791567627577a0025fd95c0aad0667e9b4ff6ea3636f709a7ef5010dee157d16bd5d42edc192ef73e2da13e918a4d38c7a535d3af1f7c46362b29196933dea31 -EBUILD virtualbox-6.1.26.ebuild 14338 BLAKE2B b30000a66c4bf1b34587ba2b3383c1ec52fa8690f5b54ded5423f124d8d9983b43968bbc33d4f24187db87cc92b6cf783e417fc76a0ff52ee69cdd81a7d5aae0 SHA512 7c8dd48f616b88613e896e2c7756b99b7a9fc9bcc7e77011f6756a223a1556c4e715d4fb9a01ade69abad6ac4a66c685256441cbda927c0a7f3a5dd085fa05d8 +EBUILD virtualbox-6.1.26.ebuild 14407 BLAKE2B d702060fb9488b7af42cb6510ddcd4aa233b784e6f42437007cde1fc3f5f0de704fbbde02c4cdee9df1f40e2e5939ad777d6ac00e385893e9966df090802d792 SHA512 b46b702c8bd2dae587cb3f8aea746ec132e46dfbdfe24d7e0ff4f38bf5ce197c7984bbcbe94174d8ff4e0a7a7b36db86de0c78678b567c20e814d4377101c82d MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3 diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch new file mode 100644 index 000000000000..57752c4bbd85 --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch @@ -0,0 +1,15 @@ +https://www.virtualbox.org/changeset/90377/vbox +https://bugs.gentoo.org/805350 +https://bugs.gentoo.org/805365 + +--- VirtualBox-6.1.26/configure ++++ VirtualBox-6.1.26/configure +@@ -1624,6 +1624,8 @@ EOF + else + # Strip .../QtCore as we add components ourself: + INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'` ++ # Strip .../QtGui as we add components ourself: ++ INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtGui|\1|g; s| $||g'` + # store only the first path, remove all other paths + # most likely pkg-config gave us -I/usr/include/qt5 -I/usr/include/qt5/QtCore + INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'` diff --git a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild index d7cbd13be91a..ee270bbcc26f 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild @@ -211,6 +211,8 @@ src_prepare() { eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch fi + eapply "${FILESDIR}/${P}-configure-include-qt5-path.patch" #805365 + eapply "${WORKDIR}/patches" default diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 0bcaf20895e2..6b0e27f50db4 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -6,7 +6,7 @@ DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581 -EBUILD wine-vanilla-6.0.1.ebuild 18930 BLAKE2B 93bb18a7e02a46a2cdb448a5b6ea97dbd3353361730f9e6a571d93129b0f084133a4d29fe4686c9ff3219147779a018c6efebc13c25c04c3e13d5969ec8a1e6f SHA512 adf6b9fbe94882bd43656124bc7d670c7a2030aa63d9124bcd7a3a349da5897e548b9ad5072299e5eee640b8ed33890074b9605580959847f04c9ceecff3ac51 +EBUILD wine-vanilla-6.0.1.ebuild 18929 BLAKE2B 18385f9f90c7b1bfe05c2a497438cdf972a20cf1c4cd0ac13d38bada90cb6edd0ccaca9474e0ec70ca330afef3774165d0f6e9444e54275921503820bb6798fb SHA512 a252c8d5ae1d26924194ca75ae154be97aab1cf4dab4600c7d4992766ec4a2a98e5a403d8c9b55e7d0b91f9fa24e34729e8b5ce7859d3dbf9ca3eca58c7bdaa3 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239 EBUILD wine-vanilla-6.11.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c EBUILD wine-vanilla-6.12.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85 diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild index 2cc3f397034b..f233885c99eb 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then else MAJOR_V=$(ver_cut 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" - KEYWORDS="-* ~amd64 ~x86" + KEYWORDS="-* ~amd64 x86" fi S="${WORKDIR}/${MY_P}" |