commit: b25488eaf1e02f6267539b4c33f07bad83f9423f Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Jun 6 05:16:55 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Jun 6 07:48:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25488ea
app-emulation/virtualbox-guest-additions: drop 6.1.50-r1 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-emulation/virtualbox-guest-additions/Manifest | 2 - ...irtualbox-guest-additions-7.0.8-fix-gcc13.patch | 24 -- .../virtualbox-guest-additions-6.1.50-r1.ebuild | 292 --------------------- 3 files changed, 318 deletions(-) diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index d27f71cbdd66..dfb684f42ff0 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -1,11 +1,9 @@ -DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f DIST VirtualBox-7.0.22.tar.bz2 174643573 BLAKE2B 93ba1dd44a7147e61d72489a127e497f510c12eef576f8a30af45011e383050a908124c0f9794a92f28400cbb2f230308884893bafacd4f8a391b2354958f02d SHA512 eb231cc487becfbad8c979fb9d6a1ede3a28a1bb11e77b1482181be4bd294fd209c77a7d599562f99f1ac2be587203b9d97230ccce4f85ed96c63e66b0fce392 DIST VirtualBox-7.0.26.tar.bz2 174650718 BLAKE2B ba13a940b9566a5ac5b228bf29d49d4b9bf16a72da3212c305538711d363f1e6fddaa8717d4c46394ce488d2c1670874fece356740f421f44f6f40bd655f5551 SHA512 337f62438679f98b342213dbafdd3e07f7d7092a4205bfe388d64d1cc8224499621addea56b70d806c93290bb82e6150c07516e69250460a276e3b7a4484a9b6 DIST VirtualBox-7.1.10.tar.bz2 233395034 BLAKE2B 8f451932a4b3cd5e4628f8dd45e9a2cfec6cfbc02fd4eeb7f4dedd473c9c022f57751e4ea78ab1edd6989c111a5c751da1c87662d24c971c3f673bedcf9d6f06 SHA512 841c539b30c964eec0e3a5eddc354bcec530aeed882507928c2f0a8675756c27a650cb3094a130d4f609e83a10f1273b40e9a765228586c3c8c90bb74d7872ad DIST VirtualBox-7.1.4.tar.bz2 206218796 BLAKE2B 62a4f44b4eac2e1cb2c0bace5dfabf86c41b738d81aede3de75d88159a8d76158748eaae38ee3eedbc0f79b639a875f1ef6805a8ca7c95021f475935f54d7ef9 SHA512 97654339d509447e2604db01e29f9e810f59498a378e645f412cffb67022c4e547f205e8ebdac6ae33aaa8f7bc0f289bdca2e5a04b1fa31b4a05c191d7600a9c DIST VirtualBox-7.1.8.tar.bz2 215541146 BLAKE2B dbe8e432162ed29716e14a390be1fa14d13f861943bb2392f8de0cd8ec3dbb991588a8aafe47b2bd0884ca12932af78799d7b21a2b115d818702ccbed564dc97 SHA512 9c801309aac8eeea94279c6872892046cdf933dda0dc7493be5442a9dabbb6e5e513e116bb17d8fd225a6d6d37285f21c26e42daeb37c4335f3636b810f84dfb DIST VirtualBox-7.2.0_BETA1.tar.bz2 215213677 BLAKE2B a9298c7dfd43d8209244e952e14748657193e3eb35c4d42da1049ab8c3653196edd5bd5f8b65dba7c983cb4866a68ae0e062f607909c8f5b2132cc4b0e129dae SHA512 abc437fce93ceeb716cc3edb1551ef2ae632e1ed02705f5603a578c0fca892ae9d2d6f28ec8612dcdd87acb46840a09868880b8e0e81d9f8f858da4b86bf40ac -DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992 DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c DIST virtualbox-patches-7.1.10.tar.bz2 5966 BLAKE2B cde325931ed2b41c74c9fa070980c5a6988a658608b2899473991e58ebf995f3cfd8efd295c98181d879104249ffc021643315ffe7801d30ded663a61e442488 SHA512 82de81a6e63bbaae8a1467fe0f4b84a6a71ee3f3d2190d53215f0b0913f6d2e53623709e5063ba629798a844c0c29fa0f48aca72efc96e775d7b18f75c1de79f diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch deleted file mode 100644 index 8e53107aedbc..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-fix-gcc13.patch +++ /dev/null @@ -1,24 +0,0 @@ -This file ends up included in -src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibRuntimeXF86.cpp which -is compiled with -ffreestanding, so it shouldn't include math.h - -See also: https://bugs.gentoo.org/907597 - ---- a/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h -+++ b/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h -@@ -169,6 +169,7 @@ - #ifndef IN_MODULE - /* XXX Not for modules */ - #include <limits.h> -+#if defined __STDC_HOSTED__ && __STDC_HOSTED__ == 1 - #if !defined(MAXSHORT) || !defined(MINSHORT) || \ - !defined(MAXINT) || !defined(MININT) - /* -@@ -178,6 +179,7 @@ - - #include <math.h> - #endif -+#endif // defined __STDC_HOSTED__ && __STDC_HOSTED__ == 1 - #undef MAXSHORT - #define MAXSHORT SHRT_MAX - #undef MINSHORT diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild deleted file mode 100644 index 9331f6f9124a..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.50-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo linux-mod-r1 readme.gentoo-r1 systemd toolchain-funcs udev - -MY_PN="VirtualBox" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/"; -SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"; -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 x86" -IUSE="X +dbus" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - sys-libs/pam - sys-libs/zlib - dbus? ( sys-apps/dbus ) - X? ( - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) -" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - ) -" -BDEPEND=" - >=dev-build/kbuild-0.1.9998.3127 - <=dev-build/kbuild-0.1.9998.3500 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-power/iasl -" - -PATCHES=( - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch -) - -DOCS=() # Don't install the default README file during einstalldocs - -VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" -CONFIG_CHECK="~DRM_TTM ~DRM_VMWGFX" -WARNING_DRM_TTM="DRM_TTM is needed for running the vboxvideo driver." -WARNING_DRM_VMWGFX="DRM_VMWGFX is the recommended driver for VMSVGA." - -DOC_CONTENTS="\n -Please add users to the \"vboxguest\" group so they can\n -benefit from seamless mode, auto-resize and clipboard.\n -\n -The vboxsf group has been added to make automount services work.\n -These services are part of the shared folders support.\n -\n -Please add:\n - /etc/init.d/virtualbox-guest-additions\n -to the default runlevel in order to start\n -needed services.\n -\n -An autostart .desktop file has been installed to start\n -VBoxClient in desktop sessions.\n -\n -You can mount shared folders with:\n - mount -t vboxsf <shared_folder_name> <mount_point>\n -\n -Warning:\n - this ebuild is only needed if you are running gentoo\n - inside a VirtualBox Virtual Machine, you don't need\n - it to run VirtualBox itself.\n -\n" - -src_prepare() { - eapply "${PATCHES[@]}" - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null - eend $? || die - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - if ! use X; then - echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die - fi - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - # Respect LDFLAGS (bug #759100) - sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die - - eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches" - eapply_user -} - -src_configure() { - tc-export AR CC CXX LD RANLIB - - # Build the user-space tools, warnings are harmless - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - $(usev !dbus --disable-dbus) - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - - # bug #843437 - # Respect LDFLAGS (bug #759100) - # Cannot use LDFLAGS here because they also get passed to $(LD) - cat >> LocalConfig.kmk <<-EOF || die - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - CCLDFLAGS=${LDFLAGS} - EOF - - edo ./configure "${myconf[@]}" -} - -src_compile() { - source ./env.sh || die - - # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) - MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" - - local myemakeargs=( - VBOX_BUILD_PUBLISHER=_Gentoo - VBOX_ONLY_ADDITIONS=1 - - KBUILD_VERBOSE=2 - - AS="$(tc-getCC)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LD="$(tc-getCC)" - - TOOL_GCC3_CC="$(tc-getCC)" - TOOL_GCC3_CXX="$(tc-getCXX)" - TOOL_GCC3_LD="$(tc-getCC)" - TOOL_GCC3_AS="$(tc-getCC)" - TOOL_GCC3_AR="$(tc-getAR)" - TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" - - TOOL_GXX3_CC="$(tc-getCC)" - TOOL_GXX3_CXX="$(tc-getCXX)" - TOOL_GXX3_LD="$(tc-getCXX)" - TOOL_GXX3_AS="$(tc-getCXX)" - TOOL_GXX3_AR="$(tc-getAR)" - TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)" - - TOOL_GCC3_CFLAGS="${CFLAGS}" - TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" - VBOX_GCC_OPT="${CXXFLAGS}" - VBOX_NM="$(tc-getNM)" - TOOL_YASM_AS=yasm - ) - - MAKE="kmk" emake "${myemakeargs[@]}" - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - # Move this here for bug 836037 - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - local modlist=( vboxguest vboxsf ) - use X && modlist+=( vboxvideo ) - modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - - insinto /etc/modprobe.d # 485996 - newins - vboxsf.conf <<-EOF - # modprobe.d configuration file for VBOXSF - - # Internal Aliases - Do not edit - # ------------------------------ - alias fs-vboxsf vboxsf - EOF - - cd out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - if use dbus; then - newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} - else - newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} - fi - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - doins VBoxDRMClient - fperms 4755 /usr/bin/VBoxDRMClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload - - if ! use X ; then - elog "The use flag \"X\" is off, enable it to install the" - elog "X Window System drivers and integration." - fi - - readme.gentoo_print_elog -} - -pkg_postrm() { - udev_reload -}
