app-emulation/anbox/anbox-20211020.ebuild

@@ -30,7 +30,7 @@ IUSE="X wayland systemd"
 DEPEND="
 	>=app-containers/lxc-3.0.0
 	dev-cpp/properties-cpp
-	dev-cpp/sdbus-c++
+	dev-cpp/sdbus-cpp
 	dev-cpp/gtest
 	dev-libs/boost[threads(+)]
 	dev-libs/expat

app-emulation/anbox/anbox-99999999.ebuild

@@ -30,7 +30,7 @@ IUSE="X wayland systemd"
 DEPEND="
 	>=app-containers/lxc-3.0.0
 	dev-cpp/properties-cpp
-	dev-cpp/sdbus-c++
+	dev-cpp/sdbus-cpp
 	dev-cpp/gtest
 	dev-libs/boost[threads(+)]
 	dev-libs/expat

dev-cpp/sdbus-cpp/Manifest

@@ -0,0 +1,3 @@
+DIST sdbus-cpp-1.2.0.tar.gz 205798 BLAKE2B da040acb49f5294665b09df97c171eac38f7c6ce5e86093b45b896c4b216afc9b45870395404ffb8e7c32ac8b98f6c795fb528691b344587545e5ae27d4423d6 SHA512 dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d
+DIST sdbus-cpp-1.3.0.tar.gz 217150 BLAKE2B aa9a902cdff6a6f2268cfe04b45105ab08ee4b3a257db10af63f8224a9932e28c5f755879c866274722a2087a59c0a22dc0616ac5d696229daeaa965a156e220 SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2
+DIST systemd-stable-253.tar.gz 11987926 BLAKE2B 73319210bff59616811a36d526903a78e4af2061da9e4b23f2da88a43695b43b5c62de6ec4685f99edbe6b34d5ee1dc0f8889dc9649eb10d9b18514453ceb13e SHA512 85bc9a3715d9ccc80df2c5678b74a4a3b72569643d1779511ea631d692dea0fa1da255ef18b1c4fd477a777c036ea2afe9c0ffb29101c09c608933455002f029

dev-cpp/sdbus-cpp/files/remove_download_from_external_project-1.patch

@@ -0,0 +1,29 @@
+From 811b04abec6140d2996e581c5206cf3bac4c6399 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 17 Jul 2023 19:12:19 +0300
+Subject: [PATCH] dont clone systemd repo
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+---
+ cmake/LibsystemdExternalProject.cmake | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/cmake/LibsystemdExternalProject.cmake b/cmake/LibsystemdExternalProject.cmake
+index 40911c2..10bad8d 100644
+--- a/cmake/LibsystemdExternalProject.cmake
++++ b/cmake/LibsystemdExternalProject.cmake
+@@ -41,10 +41,7 @@ message(STATUS "Building with embedded libsystemd v${LIBSYSTEMD_VERSION}")
+ include(ExternalProject)
+ ExternalProject_Add(LibsystemdBuildProject
+                     PREFIX libsystemd-v${LIBSYSTEMD_VERSION}
+-                    GIT_REPOSITORY    https://github.com/systemd/systemd-stable.git
+-                    GIT_TAG           v${LIBSYSTEMD_VERSION}-stable
+-                    GIT_SHALLOW       1
+-                    UPDATE_COMMAND    ""
++                    SOURCE_DIR systemd
+                     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E remove <BINARY_DIR>/*
+                               COMMAND ${MESON} --prefix=<INSTALL_DIR> --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Drootprefix=<INSTALL_DIR> -Dstatic-libsystemd=pic -Dselinux=false <SOURCE_DIR> <BINARY_DIR> ${LIBSYSTEMD_EXTRA_CONFIG_OPTS}
+                     BUILD_COMMAND     ${BUILD_VERSION_H}
+-- 
+2.41.0
+

dev-cpp/sdbus-cpp/files/remove_download_from_external_project.patch

@@ -0,0 +1,18 @@
+diff --git a/cmake/LibsystemdExternalProject.cmake b/cmake/LibsystemdExternalProject.cmake
+index dfa56d4..52b6f3c 100644
+--- a/cmake/LibsystemdExternalProject.cmake
++++ b/cmake/LibsystemdExternalProject.cmake
+@@ -35,11 +35,8 @@ message(STATUS "Building with embedded libsystemd v${LIBSYSTEMD_VERSION}")
+ include(ExternalProject)
+ ExternalProject_Add(LibsystemdBuildProject
+                     PREFIX libsystemd-v${LIBSYSTEMD_VERSION}
+-                    GIT_REPOSITORY    https://github.com/systemd/systemd-stable.git
+-                    GIT_TAG           v${LIBSYSTEMD_VERSION}-stable
+-                    GIT_SHALLOW       1
+-                    UPDATE_COMMAND    ""
+-                    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E remove <BINARY_DIR>/*
++		    SOURCE_DIR systemd
++		    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E remove <BINARY_DIR>/*
+                               COMMAND ${MESON} --prefix=<INSTALL_DIR> --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Dstatic-libsystemd=pic -Dselinux=false <SOURCE_DIR> <BINARY_DIR>
+                     BUILD_COMMAND     ${BUILD_VERSION_H}
+                           COMMAND     ${NINJA} -C <BINARY_DIR> libsystemd.a

dev-cpp/sdbus-cpp/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Kistler-Group/sdbus-cpp</remote-id>
+  </upstream>
+</pkgmetadata>

dev-cpp/sdbus-cpp/sdbus-cpp-1.2.0.ebuild

@@ -0,0 +1,70 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High-level C++ D-Bus library for Linux"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp/"
+
+SYSTEMDVER="253"
+SRC_URI="
+	https://github.com/Kistler-Group/sdbus-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	!systemd? (
+		https://github.com/systemd/systemd-stable/archive/v"${SYSTEMDVER}".tar.gz
+			-> systemd-stable-"${SYSTEMDVER}".tar.gz
+	)
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples systemd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+RDEPEND="
+	${CDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-apps/dbus
+	)
+"
+
+PATCHES=( "${FILESDIR}/remove_download_from_external_project-1.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+	use systemd || mv "${WORKDIR}"/systemd-stable-"${SYSTEMDVER}" "${S}"_build/systemd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CODE_GEN=ON
+		-DBUILD_LIBSYSTEMD=$(usex !systemd)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Requires system level configs for dbus
+		--exclude-regex integration-tests
+	)
+	cmake_src_test
+}

dev-cpp/sdbus-cpp/sdbus-cpp-1.3.0.ebuild

@@ -0,0 +1,58 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High-level C++ D-Bus library for Linux"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp/"
+SRC_URI="
+	https://github.com/Kistler-Group/sdbus-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples systemd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	systemd? ( >=sys-apps/systemd-236 )
+	!systemd? ( >=sys-auth/elogind-236 )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+RDEPEND="
+	${CDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-apps/dbus
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CODE_GEN=ON
+		-DBUILD_LIBSYSTEMD=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# Requires system level configs for dbus
+		--exclude-regex integration-tests
+	)
+	cmake_src_test
+}

profiles/package.mask

@@ -1,8 +1,3 @@
-# Alfred Wingate <parona@protonmail.com> (2023-09-07)
-# Deprecated.
-# https://github.com/anbox/anbox#important---hi-there-
-app-emulation/anbox
-
 # Alfred Wingate <parona@protonmail.com> (2023-08-31)
 # Indiscriminate mask of packages with NonsolvableDepsInStable
 # Fix or remove

profiles/updates/3Q-2023

@@ -1 +0,0 @@
-move dev-cpp/sdbus-cpp dev-cpp/sdbus-c++