diff options
Diffstat (limited to 'app-emulation')
52 files changed, 850 insertions, 467 deletions
diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild b/app-emulation/cri-o/cri-o-1.17.1.ebuild index f8d6d2c59f40..d528603cf524 100644 --- a/app-emulation/cri-o/cri-o-1.17.1.ebuild +++ b/app-emulation/cri-o/cri-o-1.17.1.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" DEPEND=" ${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} - !<app-emulation/libpod-1.3.2-r1" + !<app-emulation/podman-1.3.2-r1" src_prepare() { default diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild b/app-emulation/cri-o/cri-o-1.18.3.ebuild index 96ab6f0d2857..bed85815a897 100644 --- a/app-emulation/cri-o/cri-o-1.18.3.ebuild +++ b/app-emulation/cri-o/cri-o-1.18.3.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" DEPEND=" ${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} - !<app-emulation/libpod-1.3.2-r1" + !<app-emulation/podman-1.3.2-r1" src_prepare() { default diff --git a/app-emulation/cri-o/cri-o-1.19.0.ebuild b/app-emulation/cri-o/cri-o-1.19.0.ebuild index 35566324ab43..d1678516f2e9 100644 --- a/app-emulation/cri-o/cri-o-1.19.0.ebuild +++ b/app-emulation/cri-o/cri-o-1.19.0.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" DEPEND=" ${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} - !<app-emulation/libpod-1.3.2-r1" + !<app-emulation/podman-1.3.2-r1" src_prepare() { default diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest index c2c94cd1ea00..8e154c9f9d40 100644 --- a/app-emulation/crossover-bin/Manifest +++ b/app-emulation/crossover-bin/Manifest @@ -1 +1,3 @@ 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 diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild new file mode 100644 index 000000000000..293f3f87f1eb --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +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} + $(python_gen_cond_dep ' + 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/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 + # 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/crossover-bin/crossover-bin-20.0.2.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild new file mode 100644 index 000000000000..b5ce49385e75 --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-20.0.2.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +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/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/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/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] +" + +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/crun/Manifest b/app-emulation/crun/Manifest index 412ce2e26eb7..c4fedb0663f3 100644 --- a/app-emulation/crun/Manifest +++ b/app-emulation/crun/Manifest @@ -1,3 +1,2 @@ -DIST crun-0.14.1.tar.gz 1341891 BLAKE2B c20d5001161e298050ddca859fa78487fe3f8577ef0b06eb5515056f19ba4f981debeb684148de49111a0370b9bafb7f6454d65f7ecf087862c697a162c9b377 SHA512 420f1713653cbd17df83b2a63d163aaa41baf78115b093877a2241305e10b2ceeaf08ea6700658eca894729ff8a20cbc66f868d18d27fba3fbedf1a9993b122e DIST crun-0.15.tar.gz 1364861 BLAKE2B 7078e71229bae4bc663398891b21344abc3189c78a11e4feeae3236e1df4a2c5160cf26f2cc243d4c0898a642a779603d473d2c22ca2b67123c6ac4654fce4d7 SHA512 f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325 -DIST libcrun.lds 257 BLAKE2B 00e7cdf3162ea0b7231dbb9037b192bcf5ffa83316e1aa60268560bc9fe8302be351c405861f9dfc06620ea64561a9226f58b7133039c0af1299dc4088b98272 SHA512 0e9b836c79ee4ad7ff33c592eca8ff41f38aed588f2f5a2416bed82efa819cd4c61ad65a2dfd11a37838a19d950688b1d5adb3b75841963dbb589536e8a867f7 +DIST crun-0.16.tar.gz 1370194 BLAKE2B c2a2450518226421b43d93597b38da80ca330cb3d8d9c259f323d49561e93dc3d003a25599eb8e918888dd824037c53bd0a07624c3154fa3778cc6dad37ac04b SHA512 f5a0d19c037af55478ee5f83b63d74277c8640f715b81a8233d3f1acd4cdfdad491e5c1f5beda04d0d7aa16693e9a004b0bde71343b082aa514ae76e5907d029 diff --git a/app-emulation/crun/crun-0.14.1.ebuild b/app-emulation/crun/crun-0.16.ebuild index db5dd2304c12..f6854f329500 100644 --- a/app-emulation/crun/crun-0.14.1.ebuild +++ b/app-emulation/crun/crun-0.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,24 +9,24 @@ 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 - https://github.com/containers/${PN}/raw/${PV}/libcrun.lds" +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="bpf +caps man seccomp systemd static-libs" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +IUSE="+bpf +caps criu +seccomp systemd static-libs" DEPEND=" - dev-libs/yajl + sys-kernel/linux-headers + >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) + criu? ( >=sys-process/criu-3.13 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" BDEPEND=" ${PYTHON_DEPS} - man? ( dev-go/go-md2man ) " # the crun test suite is comprehensive to the extent that tests will fail @@ -36,26 +36,14 @@ RESTRICT="test" DOCS=( README.md ) -src_unpack() { - # dont' try to unpack the .lds file - MY_A=( ${A[@]/libcrun.lds} ) - unpack ${MY_A} -} - -src_prepare() { - default - eautoreconf - cp -v "${DISTDIR}"/libcrun.lds "${S}"/ || die "libcrun.lds could not be copied" -} - src_configure() { local myeconfargs=( - --disable-criu \ - $(use_enable bpf) \ - $(use_enable caps) \ - $(use_enable seccomp) \ - $(use_enable systemd) \ - $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '') + $(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[@]}" @@ -64,16 +52,10 @@ src_configure() { src_compile() { emake -C libocispec emake crun - if use man ; then - emake generate-man - fi } src_install() { emake "DESTDIR=${D}" install-exec - if use man ; then - emake "DESTDIR=${D}" install-man - fi - + doman crun.1 einstalldocs } diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 4a1d3c68275e..eda49d389c02 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,4 +1,2 @@ DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80 -DIST docker-compose-1.28.0_rc1.tar.gz 313984 BLAKE2B 3307aab3ec842d21de73ab282905016f6b0934a2ce9d1dde474ea1e7c5894cea028363c03ec9f597cb3e9b2910e9286b2ffb3070885b20787f28767fec909a73 SHA512 87704f16bd2d6551fed0b3d38264e10cf12604f40a68637ac9dacc3aebe618872f54a890aa6bb1412143055021751bcba1b542d51b252e78b0b8948e2b8cc8fd -DIST docker-compose-1.28.0_rc2.tar.gz 314331 BLAKE2B c2e169152a6da067e47ca7654b3866fd2b46779bbf35f917008dc71a4c70ede1704bd3f6e5f2231b42d50d6d11ae9df402ed1b01832c26d5d14bdb4db33e7432 SHA512 0320f96b177034c5575797540d38981d591fe22d39ee2e1c338589189333c9eac5e595103bc7295b43b90f697b5a09daffa7f611b395e6bcf81fdce3a391eed6 -DIST docker-compose-1.28.0_rc3.tar.gz 317485 BLAKE2B 5954ebf8224b8701decf7b7c4447592f0a8ce5472e5c9307364c605e2a260ae36c69ceb95b6dc254701650873ea8f443e8767a7ba96bbeec44343b94fb8c5d36 SHA512 0d09d306c38b6c9990f5801fe12c7554694f1a270c13babeb8aecda06c428f4c8d37153439c43fd02fe3ffd59fe4f38ad48d066abfb81fcc1ce8e23e6b353ef3 +DIST docker-compose-1.28.0.tar.gz 318112 BLAKE2B 2e721f2aed08f8c63c7c75aa91e6ee28d997763a7d93921e9a62c41b7d48943221aa2135e6ba3925db67b2376f662f81ef71df15180895ea4d5ced1edd0cc493 SHA512 c673f25ff993e7dcaf75512c378339bb7435d96310bf9a47ee3fd3a515967b323ed911b77c030a8e9c1d04b8aca235565a0ca0eaeab401c4ac48110712da405e diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0.ebuild index 12e856573d56..12e856573d56 100644 --- a/app-emulation/docker-compose/docker-compose-1.28.0_rc2.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.28.0.ebuild diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild deleted file mode 100644 index b14e56f561f0..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.28.0_rc1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild b/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild deleted file mode 100644 index 12e856573d56..000000000000 --- a/app-emulation/docker-compose/docker-compose-1.28.0_rc3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-py-4.4.0[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] - >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/six-1.3.0[${PYTHON_USEDEP}] - >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] - >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.28.0_rc2-setup-py.patch -) - -DOCS=( CHANGELOG.md README.md ) - -src_prepare() { - # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." - sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die - - default -} - -python_test() { - distutils_install_for_testing - ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - newbashcomp contrib/completion/bash/docker-compose ${PN} - - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/* - - distutils-r1_python_install_all -} diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 7d79519a74d9..3caacc2a4ddb 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,4 +1,3 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 -DIST free42-nologo-2.5.20.tgz 7414358 BLAKE2B f1e0963e6a808121efc4d9bd82863d8c7898f65504d4c59f6a6beadc0c4e5c1335ce4c65d25550a3f4d5c080e1933ad30f6325661af4a513f69941c48adda1a5 SHA512 04a01f29ed5a3c9374de98ead6c54191dbde6b0e3d9923b5c89f18f868630b50235711820e751e4a1e3efc0600b1a7a105e8800f660d67124458a8f2826c840f -DIST free42-nologo-2.5.21.tgz 7416422 BLAKE2B e86d24a9d2a1fb10e2e1ed0ec9abb43fa5bab3717432402968682ac7e18b27ea0876c72466942220d234d720fc76cd239bafa993d1aba21ab845be26b53d3132 SHA512 25cec0ca7c5b9271de3d6ebf6254dbf54c6127b958e19a0c5b824c3aeffe0c84edfb6dd75eef8930c7db15c46c052bf01cdb06b0c60ac7cd2272492fe4016924 DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c +DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b diff --git a/app-emulation/free42/free42-2.5.20.ebuild b/app-emulation/free42/free42-2.5.20.ebuild deleted file mode 100644 index bd3148a0b387..000000000000 --- a/app-emulation/free42/free42-2.5.20.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV="${PN}-nologo-${PV}" - -DESCRIPTION="An HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/free42/" -SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa" - -DEPEND="dev-libs/atk - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" - "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/free42bin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.5.21.ebuild b/app-emulation/free42/free42-2.5.24.ebuild index bd3148a0b387..d25a89b2d1c4 100644 --- a/app-emulation/free42/free42-2.5.21.ebuild +++ b/app-emulation/free42/free42-2.5.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild index c196a512a7ca..60300c338e3c 100644 --- a/app-emulation/libcacard/libcacard-2.6.0.ebuild +++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 DESCRIPTION="virtual Common Access Card (CAC) library emulator" HOMEPAGE="https://www.spice-space.org/" @@ -15,12 +15,12 @@ IUSE="+passthrough static-libs" RDEPEND=">=dev-libs/nss-3.13 >=dev-libs/glib-2.22 passthrough? ( >=sys-apps/pcsc-lite-1.8 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-simpletlv-test-fix.patch" - ) +) src_prepare() { default diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild index bc1cc33342ad..4d4b548f9fc4 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild @@ -70,8 +70,11 @@ COMMON_DEPEND=" ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= - >=dev-ml/ounit-2 + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub[ocamlopt] + ) + >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild index 83b793761473..13ca49393b7b 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild @@ -68,8 +68,11 @@ COMMON_DEPEND=" ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= - >=dev-ml/ounit-2 + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub[ocamlopt] + ) + >=dev-ml/ounit-2[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild index c3fbd32d3119..82f670052cc0 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild @@ -86,7 +86,10 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub + ) >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild index 9e81a865f1ff..146dc26b6757 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild @@ -90,8 +90,11 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf >=dev-lang/ocaml-4.03:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= - >=dev-ml/ounit-2 + || ( + <dev-ml/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub[ocamlopt] + ) + >=dev-ml/ounit-2[ocamlopt] doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) diff --git a/app-emulation/libpod/libpod-2.1.0.ebuild b/app-emulation/libpod/libpod-2.1.0.ebuild deleted file mode 100644 index 8335388f9f6f..000000000000 --- a/app-emulation/libpod/libpod-2.1.0.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd" - -inherit bash-completion-r1 flag-o-matic go-module - -DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" -HOMEPAGE="https://github.com/containers/podman/" -MY_PN=podman -MY_P=${MY_PN}-${PV} -SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" -SLOT="0" - -KEYWORDS="~amd64 ~arm64" -IUSE="apparmor btrfs +fuse +rootless selinux" -RESTRICT="test" - -COMMON_DEPEND=" - app-crypt/gpgme:= - >=app-emulation/conmon-2.0.0 - || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) - dev-libs/libassuan:= - dev-libs/libgpg-error:= - >=net-misc/cni-plugins-0.8.6 - sys-fs/lvm2 - sys-libs/libseccomp:= - - apparmor? ( sys-libs/libapparmor ) - btrfs? ( sys-fs/btrfs-progs ) - rootless? ( app-emulation/slirp4netns ) - selinux? ( sys-libs/libselinux:= ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-go/go-md2man" -RDEPEND="${COMMON_DEPEND} - fuse? ( sys-fs/fuse-overlayfs )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - # Disable installation of python modules here, since those are - # installed by separate ebuilds. - local makefile_sed_args=( - -e '/^GIT_.*/d' - -e 's/$(GO) build/$(GO) build -v -work -x/' - -e 's/^\(install:.*\) install\.python$/\1/' - -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|' - ) - - has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') - - sed "${makefile_sed_args[@]}" -i Makefile || die - - sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ - -i hack/get_release_info.sh || die -} - -src_compile() { - # Filter unsupported linker flags - filter-flags '-Wl,*' - - [[ -f hack/apparmor_tag.sh ]] || die - if use apparmor; then - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die - fi - - [[ -f hack/btrfs_installed_tag.sh ]] || die - if use btrfs; then - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die - else - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ - hack/btrfs_installed_tag.sh || die - fi - - [[ -f hack/selinux_tag.sh ]] || die - if use selinux; then - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die - else - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die - fi - - # Avoid this error when generating pkg/varlink/iopodman.go: - # cannot find package "github.com/varlink/go/varlink/idl" - mkdir -p _output || die - ln -snf ../vendor _output/src || die - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die - rm _output/src || die - - export -n GOCACHE GOPATH XDG_CACHE_HOME - GOBIN="${S}/bin" \ - emake all \ - GIT_BRANCH=master \ - GIT_BRANCH_CLEAN=master \ - COMMIT_NO="${EGIT_COMMIT}" \ - GIT_COMMIT="${EGIT_COMMIT}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - insinto /etc/containers - newins test/registries.conf registries.conf.example - newins test/policy.json policy.json.example - - insinto /usr/share/containers - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json - - newinitd "${FILESDIR}"/podman.initd podman - - insinto /etc/logrotate.d - newins "${FILESDIR}/podman.logrotated" podman - - dobashcomp completions/bash/* - - keepdir /var/lib/containers -} - -pkg_preinst() { - LIBPOD_ROOTLESS_UPGRADE=false - if use rootless; then - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true - fi -} - -pkg_postinst() { - local want_newline=false - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then - elog "You need to create the following config files:" - elog "/etc/containers/registries.conf" - elog "/etc/containers/policy.json" - elog "To copy over default examples, use:" - elog "cp /etc/containers/registries.conf{.example,}" - elog "cp /etc/containers/policy.json{.example,}" - want_newline=true - fi - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then - ${want_newline} && elog "" - elog "For rootless operation, you need to configure subuid/subgid" - elog "for user running podman. In case subuid/subgid has only been" - elog "configured for root, run:" - elog "usermod --add-subuids 1065536-1131071 <user>" - elog "usermod --add-subgids 1065536-1131071 <user>" - want_newline=true - fi -} diff --git a/app-emulation/libpod/Manifest b/app-emulation/podman/Manifest index 62494a75e866..41fac5271911 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/podman/Manifest @@ -1,2 +1 @@ -DIST podman-2.1.0.tar.gz 9444707 BLAKE2B 62dacd316a8d6ae8aab0523338d818c69cf1228120e828a89301c9fdbb98082b85328c03c61f9f2a36c7a50105ce5fd025ad2b0e9ba2705c86b0d7e263fc92a6 SHA512 eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367 diff --git a/app-emulation/libpod/files/podman.initd b/app-emulation/podman/files/podman.initd index b590be16a1ba..b590be16a1ba 100644 --- a/app-emulation/libpod/files/podman.initd +++ b/app-emulation/podman/files/podman.initd diff --git a/app-emulation/libpod/files/podman.logrotated b/app-emulation/podman/files/podman.logrotated index b9d723451b0a..b9d723451b0a 100644 --- a/app-emulation/libpod/files/podman.logrotated +++ b/app-emulation/podman/files/podman.logrotated diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/podman/metadata.xml index 67b8434984ab..dc267f045ea2 100644 --- a/app-emulation/libpod/metadata.xml +++ b/app-emulation/podman/metadata.xml @@ -6,10 +6,13 @@ <name>Zac Medico</name> </maintainer> <longdescription lang="en"> - libpod provides a library for applications looking to use the - Container Pod concept popularized by Kubernetes. libpod also - contains a tool called podman for managing Pods, Containers, - and Container Images. + Podman (the POD MANager) is a tool for managing containers + and images, volumes mounted into those containers, and pods + made from groups of containers. Podman is based on libpod, + a library for container lifecycle management that is also + contained in this repository. The libpod library provides + APIs for managing containers, pods, container images, + and volumes. </longdescription> <use> <flag name="apparmor"> @@ -28,7 +31,7 @@ </flag> </use> <upstream> - <remote-id type="github">containers/libpod</remote-id> + <remote-id type="github">containers/podman</remote-id> </upstream> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/app-emulation/libpod/libpod-2.2.1.ebuild b/app-emulation/podman/podman-2.2.1.ebuild index fc16a6b258ee..bca75d6fddbd 100644 --- a/app-emulation/libpod/libpod-2.2.1.ebuild +++ b/app-emulation/podman/podman-2.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -131,9 +131,9 @@ src_install() { } pkg_preinst() { - LIBPOD_ROOTLESS_UPGRADE=false + PODMAN_ROOTLESS_UPGRADE=false if use rootless; then - has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true + has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true fi } @@ -148,7 +148,7 @@ pkg_postinst() { elog "cp /etc/containers/policy.json{.example,}" want_newline=true fi - if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then + if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then ${want_newline} && elog "" elog "For rootless operation, you need to configure subuid/subgid" elog "for user running podman. In case subuid/subgid has only been" diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest index afc7360b5036..d8eb5a72e40a 100644 --- a/app-emulation/protontricks/Manifest +++ b/app-emulation/protontricks/Manifest @@ -1,2 +1,3 @@ DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9 DIST protontricks-1.4.2.gh.tar.gz 41381 BLAKE2B 9030c5cc0781303834af3b478e78f9ba43f01c68c5e203df20a9db80492dd5e641134b796158011a15e65f6907f27a67c542323ea8f9e10c49dca3f5c663458a SHA512 8b60233723130e5f7cd1a7ce7b9563ba1cc8595352b6d942d9ce66a6906f18d86cf97e2b49cbdb8e276fad6cd038eaf1de8a704a8b900b29de5dfb7327b045d0 +DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64 diff --git a/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch new file mode 100644 index 000000000000..e8c6d75036b8 --- /dev/null +++ b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch @@ -0,0 +1,32 @@ +Since version 1.4.1 upstream has used setuptools-scm to determine the +current version number. Unfortunately the package in question does not +support GitHub release archives, using GitHub VCS snapshots would require +retrieving and updating commit hashes corresponding to release tags, and +PyPI tarballs do not contain tests. setuptools_scm_git_archive does not +help because it requires extra files to be included in the repository, +which upstream has not done. + +Seeing as we already know the version number, bypass setuptools_scm +altogether and create the version file ourselves. For obvious reasons the +latter has to be done in ebuilds themselves. + +--- a/setup.py ++++ b/setup.py +@@ -16,9 +16,6 @@ + + setup( + name="protontricks", +- use_scm_version={ +- "write_to": "src/protontricks/_version.py" +- }, + description=DESCRIPTION, + long_description=LONG_DESCRIPTION, + author=AUTHOR, +@@ -28,7 +25,6 @@ + packages=["protontricks"], + package_data={"": ["LICENSE"]}, + package_dir={"protontricks": "src/protontricks"}, +- setup_requires=["setuptools_scm"], + install_requires=["vdf>=3.2"], + entry_points={ + "console_scripts": [ diff --git a/app-emulation/protontricks/protontricks-1.4.3.ebuild b/app-emulation/protontricks/protontricks-1.4.3.ebuild new file mode 100644 index 000000000000..d0453a6c6ba1 --- /dev/null +++ b/app-emulation/protontricks/protontricks-1.4.3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games" +HOMEPAGE="https://github.com/Matoking/protontricks" +SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+gui" + +RDEPEND="app-emulation/winetricks + $(python_gen_cond_dep ' + dev-python/vdf[${PYTHON_USEDEP}] + ') + gui? ( gnome-extra/zenity + || ( + app-emulation/winetricks[gtk] + app-emulation/winetricks[kde] + ) + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch +) + +DOCS=( CHANGELOG.md README.md ) + +distutils_enable_tests pytest + +python_prepare_all() { + distutils-r1_python_prepare_all + echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file" +} + +pkg_postinst() { + elog + + if ! use gui; then + ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option," + ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed." + ewarn + fi + + elog "Protontricks can only find games for which a Proton prefix already exists." + elog "Make sure to run a Proton game at least once before trying to use protontricks on it." + elog +} diff --git a/app-emulation/qemu/qemu-5.1.0-r3.ebuild b/app-emulation/qemu/qemu-5.1.0-r3.ebuild index 33e49e160e24..4bb948e073bb 100644 --- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild +++ b/app-emulation/qemu/qemu-5.1.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild index f9802f8ca290..baec579454d4 100644 --- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r1.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/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest new file mode 100644 index 000000000000..3d837e82ee92 --- /dev/null +++ b/app-emulation/vendor-reset/Manifest @@ -0,0 +1 @@ +DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f diff --git a/app-emulation/vendor-reset/files/modload.conf b/app-emulation/vendor-reset/files/modload.conf new file mode 100644 index 000000000000..ff75088aa8fe --- /dev/null +++ b/app-emulation/vendor-reset/files/modload.conf @@ -0,0 +1 @@ +vendor-reset diff --git a/app-emulation/vendor-reset/metadata.xml b/app-emulation/vendor-reset/metadata.xml new file mode 100644 index 000000000000..1cf868150c78 --- /dev/null +++ b/app-emulation/vendor-reset/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sarnex@gentoo.org</email> + <name>Nick Sarnie</name> + </maintainer> + <upstream> + <remote-id type="github">gnif/vendor-reset</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild new file mode 100644 index 000000000000..c772c4558764 --- /dev/null +++ b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" + EGIT_BRANCH="master" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Linux kernel vendor specific hardware reset module" +HOMEPAGE="https://github.com/gnif/vendor-reset" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="" +RDEPEND="${DEPEND}" + +pkg_setup() { + local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" + linux-mod_pkg_setup +} + +src_compile() { + set_arch_to_kernel + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" +} + +src_install() { + set_arch_to_kernel + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + install + + insinto /etc/modules-load.d/ + newins "${FILESDIR}"/modload.conf vendor-reset.conf +} diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild new file mode 100644 index 000000000000..c772c4558764 --- /dev/null +++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git" + EGIT_BRANCH="master" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Linux kernel vendor specific hardware reset module" +HOMEPAGE="https://github.com/gnif/vendor-reset" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="" +RDEPEND="${DEPEND}" + +pkg_setup() { + local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER" + linux-mod_pkg_setup +} + +src_compile() { + set_arch_to_kernel + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" +} + +src_install() { + set_arch_to_kernel + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + install + + insinto /etc/modules-load.d/ + newins "${FILESDIR}"/modload.conf vendor-reset.conf +} diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest index f3ffb3babcc6..b5810222c418 100644 --- a/app-emulation/virtio-win/Manifest +++ b/app-emulation/virtio-win/Manifest @@ -1,3 +1,4 @@ DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198 DIST virtio-win-0.1.187.iso 433235968 BLAKE2B 0df10aa5f46cd70f7530f6d677b882df364a0b1a859d7e9fe777817136213d4f856116cf73b8521e8720c203bca3321b9a7bdae057f867e655764a8b7d5dc0b2 SHA512 db9938f1f17b723a994d1bd5bb0e0ffce47ae2bbfa96f9bdf1d895750502600f9a71f0486a97af9301659e05ebd5365d1f08dc0e062d1f9e4c3acaac8b7f0bf5 +DIST virtio-win-0.1.190.iso 501745664 BLAKE2B f9f2bc4dc371ff412dfd0b65228e0984c30a1fe1b30307d3894f2b238a8993e96fda75f931080aeff06a29467a678ca02174a876b9f339a4c8d199fd9c8a9917 SHA512 dfdaddb99c92d633368eb243801425abbcb09e4693be658efe531c33a47600b165e598ddac594239402d2c578f24f5400b5e7b643f17e7db4ebba2d4d99cf0fd diff --git a/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild new file mode 100644 index 000000000000..9b0970a358d2 --- /dev/null +++ b/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV=$(ver_cut 1-3) +MY_DW=$(ver_rs 3 -) + +DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM" +HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html" +SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +S="${WORKDIR}" + +src_install() { + insinto /usr/share/drivers/windows + doins "${DISTDIR}/${PN}-${MY_PV}.iso" + dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso" +} diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index 22bfed5c1f90..962391563540 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,2 +1,2 @@ -DIST VBoxGuestAdditions_6.0.24.iso 77355008 BLAKE2B 3bb611323ba41ad94a75d5d28198aaf732bd7c36965abc65755c0ffeec29bd378cf4351b838675667958086e499f5791b942a8e3877c1ed815a22c4d564147a1 SHA512 aea64aff216a0cfa3535d2215ec74dd46243f9aba0c1b95f476bb8f0b3d561994f4fc8cc7d454f03482e1cec9a227014f10045e75756767bd8006e8beb9aaade DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a SHA512 e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280 +DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild index feae0de326e4..5f7f607a912a 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" +KEYWORDS="amd64" IUSE="" RESTRICT="mirror" diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index b078883334a2..9e4725abc1ce 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1,2 +1,2 @@ -DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.24-139119.tar.gz 23238486 BLAKE2B cad4e6822b51db05fb0b919f4c44ace1743a9d2b5ebcc0da6fe3c9ec43612ec6079614f5d3a9423c320e65b5438089aeef42f331946eb74093e3f8b1ef137300 SHA512 4be76fffb8508dda561e74daf68c71641a0903e554ecdf6b102f3fe35af03883bc88c2ac3cbdae2b3ddfb7ee5c9bdfa8df670662eef139f2a894dea4aa6f2e18 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc SHA512 89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb +DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild index 1ced8bb1016c..54db34dd7a15 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.18.142142.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,11 +26,11 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac LICENSE="PUEL" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" +KEYWORDS="amd64" IUSE="" RESTRICT="bindist mirror strip" -RDEPEND="~app-emulation/virtualbox-${DEP_PV}" +RDEPEND="=app-emulation/virtualbox-${DEP_PV}*" S="${WORKDIR}" diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index e4e5c245c444..7e4f05e011f8 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,4 +1,3 @@ -DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534 DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421 -DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029 +DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild index 113acb8e12ca..5000d477eb16 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}. LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="X" # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild index 8a69b30c9df7..5000d477eb16 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18.ebuild @@ -1,17 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit linux-mod systemd toolchain-funcs +MY_PN="VirtualBox" MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" -MY_P="VirtualBox-${MY_PV}" +MY_P="${MY_PN}-${MY_PV}" +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" + DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.24-patches-01.tar.xz" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz" LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" @@ -51,7 +54,7 @@ PDEPEND=" BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}" VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" pkg_setup() { diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index eac316b19c72..730ec003094d 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,2 +1,2 @@ -DIST vbox-kernel-module-src-6.0.24.tar.xz 670960 BLAKE2B 26e4b1b6b9ab8c8fd0312b2162fe745dc11ef3f8a7e2f08f49df9d9ef346ec21b64e4a0a480bd726e9cca6ab2ce5d3cf2637aa8923c0843bf78a3ed160b98810 SHA512 9b1093307dffeb64f3ec22c4797268858e1fcc729403e89294c2e3cf0852662b7b0aad4416a593fd25b2107a1995d6bc17078f072b6f7718ed111ab61df8324e 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 diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild index a56ac88cb0f4..a884e1456d03 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # XXX: the tarball here is just the kernel modules split out of the binary @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" +KEYWORDS="amd64" IUSE="pax_kernel" RDEPEND="!=app-emulation/virtualbox-9999" @@ -24,16 +24,10 @@ RDEPEND="!=app-emulation/virtualbox-9999" S="${WORKDIR}" BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})" +MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})" MODULESD_VBOXDRV_ENABLED="yes" MODULESD_VBOXNETADP_ENABLED="no" MODULESD_VBOXNETFLT_ENABLED="no" -# The following is a security measure that comes directly from usptream. -# Do NOT remove this!!! -MODULESD_VBOXPCI_ADDITIONS=( - "blacklist vboxpci" - "install vboxpci /bin/true" -) pkg_setup() { linux-mod_pkg_setup @@ -53,3 +47,9 @@ src_install() { insinto /usr/lib/modules-load.d/ newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf } + +pkg_postinst() { + # Remove vboxpci.ko from current running kernel + find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete + linux-mod_pkg_postinst +} diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index e4e5c245c444..7e4f05e011f8 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -1,4 +1,3 @@ -DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534 DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421 -DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029 +DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 diff --git a/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild index 083e9516b000..186b376ca84b 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,26 +6,28 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg +MY_PN="VirtualBox" MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} +MY_P=${MY_PN}-${MY_PV} +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.24-patches-01.tar.xz" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz" LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" +KEYWORDS="amd64" IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" CDEPEND=" ${PYTHON_DEPS} !app-emulation/virtualbox-bin acct-group/vboxusers - ~app-emulation/virtualbox-modules-${PV} + ~app-emulation/virtualbox-modules-${DIR_PV:-${PV}} dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl @@ -128,7 +130,7 @@ QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so usr/lib/virtualbox/VBoxNetDHCP.so usr/lib/virtualbox/VBoxNetNAT.so" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}" REQUIRED_USE=" java? ( sdk ) @@ -170,7 +172,7 @@ src_prepare() { # Replace pointless GCC version check with something less stupid. # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \ + sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \ -i configure || die # Disable things unused or split into separate ebuilds @@ -267,6 +269,7 @@ src_compile() { TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ + VBOX_WITH_VBOXIMGMOUNT=1 \ all } @@ -308,12 +311,7 @@ src_install() { insinto ${vbox_inst_path} doins -r components - # *.rc files for x86_64 are only available on multilib systems - local rcfiles="*.rc" - if use amd64 && ! has_multilib_profile ; then - rcfiles="" - fi - for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do vbox_inst ${each} done @@ -338,6 +336,7 @@ src_install() { dosym ${vbox_inst_path}/VBox /usr/bin/${each} done dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl + dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount if use pam ; then # VRDPAuth only works with this (bug #351949) @@ -434,6 +433,9 @@ src_install() { newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi + # Remove dead symlinks (bug #715338) + find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die + # Fix version string in extensions or else they don't get accepted # by the virtualbox host process (see bug #438930) find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ @@ -479,7 +481,7 @@ pkg_postinst() { elog "You must be in the vboxusers group to use VirtualBox." elog "" elog "The latest user manual is available for download at:" - elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" + elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf" elog "" elog "For advanced networking setups you should emerge:" elog "net-misc/bridge-utils and sys-apps/usermode-utilities" diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest index 2848d25aae03..c534cd48a6cc 100644 --- a/app-emulation/winetricks/Manifest +++ b/app-emulation/winetricks/Manifest @@ -1,2 +1,3 @@ DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588 +DIST winetricks-20201206.tar.gz 690966 BLAKE2B 8304d64657fdd921974f0c326bb4e0e1d859a69e573a7387c945c7dbfd20540621cc9c89718069b569309ac2358872083d651d29ddce616d1c2cf9a12ed39943 SHA512 6965bea9bc8bb212fe2b851a53dd144c52b37466cd0d6d6a933e4e0c16b202647f1b19804159642ce9fda566872ca51e8326e8716fafdea43cd09f24ed6b4a25 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a diff --git a/app-emulation/winetricks/winetricks-20201206.ebuild b/app-emulation/winetricks/winetricks-20201206.ebuild new file mode 100644 index 000000000000..89dcbb57c973 --- /dev/null +++ b/app-emulation/winetricks/winetricks-20201206.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 +} diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild index 3b4cea7a0559..89dcbb57c973 100644 --- a/app-emulation/winetricks/winetricks-99999999.ebuild +++ b/app-emulation/winetricks/winetricks-99999999.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=7 -inherit desktop xdg +inherit xdg if [[ ${PV} == "99999999" ]] ; then EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git" @@ -84,10 +84,8 @@ src_test() { src_install() { default - if use gtk || use kde; then - cd "${WORKDIR}/${wtg}" || die - domenu winetricks.desktop - insinto /usr/share/icons/hicolor/scalable/apps - doins wine-winetricks.svg + if ! use gtk && ! use kde; then + rm -r "${ED}"/usr/share/applications || die + rm -r "${ED}"/usr/share/icons || die fi } |