diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/Manifest
index 1758356071..24a1889feb 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/Manifest
@@ -1,3 +1 @@
-DIST dbus-1.15.8.tar.xz 1149088 BLAKE2B 7c1962dfccc6a1b6250e80b0706d7f44536fabeff009013865ec4b1edaec6d4b47dcbe8f78caa61ef7aef4bac6b79f0e2027dd16bbb2baae328429e648bf8b8c SHA512 84b8ac194ede3bf300f4501395b7253538469a4f9d59ea4adaf800282e359ef43494d81941b338081d3704317d39f0aba14906c6490419f04f946eb9d815f46c
-DIST dbus-1.16.0.tar.xz 1114680 BLAKE2B a5a3ebe777c1c0296ba7240f9ed29ad329a6578a05baf10a469ce8c7d243791d35aca42a70d04cdd88feea238d081c3c8b0db444df24abcf7ce5ffe9187a0440 SHA512 9206bf4e41575f379e4c615212d137600967311f3c8feac94692aadf4dca9df9169ae52c404ec8ed31a9b2bc718792be920ac0130f1159f082e4b6c66f3f233e
DIST dbus-1.16.2.tar.xz 1115644 BLAKE2B ddca8abdd5df70b24d51293a262cda3f9e69681b31ae8bb560a6286ca6f2dc0c420dc5322a61bb142a77b2b5f86bdafcc6bf84b0d78af9610af7a78763b8b8fb SHA512 5c26f52d85984bb9ae1dde8d7e73921eacbdf020a61ff15f00a4c240cb38a121553ee04bd66e62b28425ff9bc50f4f5e15135166573ac0888332a01a0db1faa2
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.15.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.15.8.ebuild
deleted file mode 100644
index 79d7d089c6..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.15.8.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Be careful with packaging odd-version-number branches!
-# After >1.15, we should at least keep stable as an upstream stable branch,
-# possibly even ~arch too, given the note about security releases on their website.
-# See https://www.freedesktop.org/wiki/Software/dbus/#download.
-
-PYTHON_COMPAT=( python3_{10..12} )
-TMPFILES_OPTIONAL=1
-
-inherit linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-# TODO: USE=daemon
-IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- dev-build/autoconf-archive
- virtual/pkgconfig
- doc? ( app-text/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? (
- sys-process/audit
- sys-libs/libselinux
- )
- systemd? ( sys-apps/systemd:= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/expat
- test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
- valgrind? ( >=dev-debug/valgrind-3.6 )
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15.8-enable-elogind.patch # bug #599494
-)
-
-pkg_setup() {
- # Python interpeter required unconditionally (bug #932517)
- python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
-
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
-
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
- -Druntime_dir="${EPREFIX}${rundir}"
-
- -Ddefault_library=$(multilib_native_usex static-libs both shared)
-
- -Dapparmor=disabled
- -Dasserts=false # TODO
- -Dchecks=false # TODO
- $(meson_use debug stats)
- $(meson_use debug verbose_mode)
- -Dcontainers=false
- -Ddbus_user=messagebus
- -Dkqueue=disabled
- $(meson_feature kernel_linux inotify)
- $(meson_native_use_feature doc doxygen_docs)
- $(meson_native_enabled xml_docs) # Controls man pages
-
- -Dembedded_tests=false
- -Dinstalled_tests=false
- $(meson_native_true message_bus) # TODO: USE=daemon?
- $(meson_feature test modular_tests)
- -Dqt_help=disabled
-
- $(meson_native_true tools)
-
- $(meson_native_use_feature elogind)
- $(meson_native_use_feature systemd)
- $(meson_use systemd user_session)
- $(meson_native_use_feature X x11_autolaunch)
- $(meson_native_use_feature valgrind)
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it if
- # not on an SELinux profile.
- $(meson_native_use_feature selinux)
- $(meson_native_use_feature selinux libaudit)
-
- -Dsession_socket_dir="${EPREFIX}"/tmp
- -Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
- -Dsystem_socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- -Dsystemd_system_unitdir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unitdir="$(systemd_get_userunitdir)"
- )
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- emesonargs+=(
- -Dlaunchd=enabled
- -Dlaunchd_agent_dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- meson_src_configure
-}
-
-multilib_src_compile() {
- # After the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- meson_src_compile
-}
-
-multilib_src_test() {
- # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
- DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx meson_src_test
-
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
-
- if use X; then
- # dbus X session script (bug #77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/80-dbus-r1 80-dbus
- fi
-
- # Needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # Let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/{,var/}run
-
- # bug #761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS NEWS README doc/TODO
- readme.gentoo_create_doc
-
- mv "${ED}"/usr/share/doc/dbus/* "${ED}"/usr/share/doc/${PF}/ || die
- rm -rf "${ED}"/usr/share/doc/dbus || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0-r3.ebuild
deleted file mode 100644
index 329294046b..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Be careful with packaging odd-version-number branches!
-# We should at the very least keep stable as an upstream stable branch,
-# possibly even ~arch too, given the note about security releases on their website.
-# See https://www.freedesktop.org/wiki/Software/dbus/#download.
-
-PYTHON_COMPAT=( python3_{10..13} )
-TMPFILES_OPTIONAL=1
-
-inherit linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-# TODO: USE=daemon
-IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- dev-build/autoconf-archive
- virtual/pkgconfig
- doc? ( app-text/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? (
- sys-process/audit
- sys-libs/libselinux
- )
- systemd? ( sys-apps/systemd:= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/expat
- test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
- valgrind? ( >=dev-debug/valgrind-3.6 )
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.16.0-enable-elogind.patch # bug #599494
-)
-
-pkg_setup() {
- # Python interpeter required unconditionally (bug #932517)
- python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
-
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
-
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
- -Druntime_dir="${EPREFIX}${rundir}"
-
- -Ddefault_library=$(multilib_native_usex static-libs both shared)
-
- -Dapparmor=disabled
- -Dasserts=false # TODO
- -Dchecks=false # TODO
- $(meson_use debug stats)
- $(meson_use debug verbose_mode)
- -Ddbus_user=messagebus
- -Dkqueue=disabled
- $(meson_feature kernel_linux inotify)
- $(meson_native_use_feature doc doxygen_docs)
- $(meson_native_enabled xml_docs) # Controls man pages
-
- -Dinstalled_tests=false
- $(meson_native_true message_bus) # TODO: USE=daemon?
- $(meson_feature test modular_tests)
- -Dqt_help=disabled
-
- $(meson_native_true tools)
-
- $(meson_native_use_feature elogind)
- $(meson_native_use_feature systemd)
- $(meson_use systemd user_session)
- $(meson_native_use_feature X x11_autolaunch)
- $(meson_native_use_feature valgrind)
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it if
- # not on an SELinux profile.
- $(meson_native_use_feature selinux)
- $(meson_native_use_feature selinux libaudit)
-
- -Dsession_socket_dir="${EPREFIX}"/tmp
- -Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
- -Dsystem_socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- -Dsystemd_system_unitdir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unitdir="$(systemd_get_userunitdir)"
- )
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- emesonargs+=(
- -Dlaunchd=enabled
- -Dlaunchd_agent_dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- meson_src_configure
-}
-
-multilib_src_compile() {
- # After the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- meson_src_compile
-}
-
-multilib_src_test() {
- # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
- DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx meson_src_test
-
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
- exeinto /etc/user/init.d
- newexe "${FILESDIR}/dbus.user.initd" dbus
-
- if use X; then
- # dbus X session script (bug #77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/80-dbus-r1 80-dbus
- fi
-
- # Needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # Let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/{,var/}run
-
- # bug #761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS NEWS README doc/TODO
- readme.gentoo_create_doc
-
- mv "${ED}"/usr/share/doc/dbus/* "${ED}"/usr/share/doc/${PF}/ || die
- rm -rf "${ED}"/usr/share/doc/dbus || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0.ebuild
deleted file mode 100644
index ce3cee9230..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Be careful with packaging odd-version-number branches!
-# We should at the very least keep stable as an upstream stable branch,
-# possibly even ~arch too, given the note about security releases on their website.
-# See https://www.freedesktop.org/wiki/Software/dbus/#download.
-
-PYTHON_COMPAT=( python3_{10..13} )
-TMPFILES_OPTIONAL=1
-
-inherit linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-# TODO: USE=daemon
-IUSE="debug doc elogind selinux static-libs systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- acct-user/messagebus
- app-text/xmlto
- app-text/docbook-xml-dtd:4.4
- dev-build/autoconf-archive
- virtual/pkgconfig
- doc? ( app-text/doxygen )
-"
-COMMON_DEPEND="
- >=dev-libs/expat-2.1.0
- elogind? ( sys-auth/elogind )
- selinux? (
- sys-process/audit
- sys-libs/libselinux
- )
- systemd? ( sys-apps/systemd:= )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/expat
- test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
- valgrind? ( >=dev-debug/valgrind-3.6 )
- X? ( x11-base/xorg-proto )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- acct-user/messagebus
- selinux? ( sec-policy/selinux-dbus )
- systemd? ( virtual/tmpfiles )
-"
-
-DOC_CONTENTS="
- Some applications require a session bus in addition to the system
- bus. Please see \`man dbus-launch\` for more information.
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.16.0-enable-elogind.patch # bug #599494
-)
-
-pkg_setup() {
- # Python interpeter required unconditionally (bug #932517)
- python-any-r1_pkg_setup
-
- if use kernel_linux; then
- CONFIG_CHECK="~EPOLL"
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- local rundir=$(usex kernel_linux /run /var/run)
-
- sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
- > "${T}"/dbus.initd || die
-
- meson-multilib_src_configure
-}
-
-multilib_src_configure() {
- local emesonargs=(
- --localstatedir="${EPREFIX}/var"
- -Druntime_dir="${EPREFIX}${rundir}"
-
- -Ddefault_library=$(multilib_native_usex static-libs both shared)
-
- -Dapparmor=disabled
- -Dasserts=false # TODO
- -Dchecks=false # TODO
- $(meson_use debug stats)
- $(meson_use debug verbose_mode)
- -Ddbus_user=messagebus
- -Dkqueue=disabled
- $(meson_feature kernel_linux inotify)
- $(meson_native_use_feature doc doxygen_docs)
- $(meson_native_enabled xml_docs) # Controls man pages
-
- -Dinstalled_tests=false
- $(meson_native_true message_bus) # TODO: USE=daemon?
- $(meson_feature test modular_tests)
- -Dqt_help=disabled
-
- $(meson_native_true tools)
-
- $(meson_native_use_feature elogind)
- $(meson_native_use_feature systemd)
- $(meson_use systemd user_session)
- $(meson_native_use_feature X x11_autolaunch)
- $(meson_native_use_feature valgrind)
-
- # libaudit is *only* used in DBus wrt SELinux support, so disable it if
- # not on an SELinux profile.
- $(meson_native_use_feature selinux)
- $(meson_native_use_feature selinux libaudit)
-
- -Dsession_socket_dir="${EPREFIX}"/tmp
- -Dsystem_pid_file="${EPREFIX}${rundir}"/dbus.pid
- -Dsystem_socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
- -Dsystemd_system_unitdir="$(systemd_get_systemunitdir)"
- -Dsystemd_user_unitdir="$(systemd_get_userunitdir)"
- )
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- emesonargs+=(
- -Dlaunchd=enabled
- -Dlaunchd_agent_dir="${EPREFIX}"/Library/LaunchAgents
- )
- fi
-
- meson_src_configure
-}
-
-multilib_src_compile() {
- # After the compile, it uses a selinuxfs interface to
- # check if the SELinux policy has the right support
- use selinux && addwrite /selinux/access
-
- meson_src_compile
-}
-
-multilib_src_test() {
- # DBUS_TEST_MALLOC_FAILURES=0 to avoid huge test logs
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
- DBUS_TEST_MALLOC_FAILURES=0 DBUS_VERBOSE=1 virtx meson_src_test
-
-}
-
-multilib_src_install_all() {
- newinitd "${T}"/dbus.initd dbus
-
- if use X; then
- # dbus X session script (bug #77504)
- # turns out to only work for GDM (and startx). has been merged into
- # other desktop (kdm and such scripts)
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/80-dbus-r1 80-dbus
- fi
-
- # Needs to exist for dbus sessions to launch
- keepdir /usr/share/dbus-1/services
- keepdir /etc/dbus-1/{session,system}.d
- # machine-id symlink from pkg_postinst()
- keepdir /var/lib/dbus
- # Let the init script create the /var/run/dbus directory
- rm -rf "${ED}"/{,var/}run
-
- # bug #761763
- rm -rf "${ED}"/usr/lib/sysusers.d
-
- dodoc AUTHORS NEWS README doc/TODO
- readme.gentoo_create_doc
-
- mv "${ED}"/usr/share/doc/dbus/* "${ED}"/usr/share/doc/${PF}/ || die
- rm -rf "${ED}"/usr/share/doc/dbus || die
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if use systemd; then
- tmpfiles_process dbus.conf
- fi
-
- # Ensure unique id is generated and put it in /etc wrt bug #370451 but symlink
- # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
- # dependencies with hardcoded paths (although the known ones got fixed already)
- # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
- dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
- ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
- if [[ ${CHOST} == *-darwin* ]]; then
- local plist="org.freedesktop.dbus-session.plist"
- elog
- elog "For MacOS/Darwin we now ship launchd support for dbus."
- elog "This enables autolaunch of dbus at session login and makes"
- elog "dbus usable under MacOS/Darwin."
- elog
- elog "The launchd plist file ${plist} has been"
- elog "installed in ${EPREFIX}/Library/LaunchAgents."
- elog "For it to be used, you will have to do all of the following:"
- elog " + cd ~/Library/LaunchAgents"
- elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
- elog " + logout and log back in"
- elog
- elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
- elog "specified and refused to start otherwise, then export the"
- elog "the following to your environment:"
- elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
- fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.2.ebuild
index f5e8da4278..8012038271 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/dbus-1.16.2.ebuild
@@ -8,7 +8,7 @@ EAPI=8
# possibly even ~arch too, given the note about security releases on their website.
# See https://www.freedesktop.org/wiki/Software/dbus/#download.
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
TMPFILES_OPTIONAL=1
inherit linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx
@@ -17,7 +17,7 @@ DESCRIPTION="A message bus system, a simple way for applications to talk to each
HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
-LICENSE="|| ( AFL-2.1 GPL-2 )"
+LICENSE="|| ( AFL-2.1 GPL-2+ ) Apache-2.0 BSD GPL-2+ LGPL-2.1+ MIT tcltk"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
# TODO: USE=daemon
@@ -26,9 +26,9 @@ RESTRICT="!test? ( test )"
BDEPEND="
${PYTHON_DEPS}
- acct-user/messagebus
app-text/xmlto
app-text/docbook-xml-dtd:4.4
+ acct-user/messagebus
dev-build/autoconf-archive
virtual/pkgconfig
doc? ( app-text/doxygen )
@@ -48,7 +48,6 @@ COMMON_DEPEND="
"
DEPEND="
${COMMON_DEPEND}
- dev-libs/expat
test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
valgrind? ( >=dev-debug/valgrind-3.6 )
X? ( x11-base/xorg-proto )
@@ -131,7 +130,7 @@ multilib_src_configure() {
-Dsystemd_user_unitdir="$(systemd_get_userunitdir)"
)
- if [[ ${CHOST} == *-darwin* ]] ; then
+ if [[ ${CHOST} == *-darwin* ]]; then
emesonargs+=(
-Dlaunchd=enabled
-Dlaunchd_agent_dir="${EPREFIX}"/Library/LaunchAgents
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/metadata.xml
index e74554521c..760e57ac32 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/dbus/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/dbus/metadata.xml
@@ -5,10 +5,12 @@
freedesktop-bugs@gentoo.org
+ https://gitlab.freedesktop.org/dbus/dbus/-/issues
+ https://gitlab.freedesktop.org/dbus/dbus/-/tags
+ https://www.freedesktop.org/wiki/Software/dbus/#documentation
cpe:/a:freedesktop:dbus
dbus/dbus