diff --git a/app-emulation/anbox/anbox-20211020.ebuild b/app-emulation/anbox/anbox-20211020.ebuild index 721306e..0e08bda 100644 --- a/app-emulation/anbox/anbox-20211020.ebuild +++ b/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-cpp + dev-cpp/sdbus-c++ dev-cpp/gtest dev-libs/boost[threads(+)] dev-libs/expat diff --git a/app-emulation/anbox/anbox-99999999.ebuild b/app-emulation/anbox/anbox-99999999.ebuild index 721306e..0e08bda 100644 --- a/app-emulation/anbox/anbox-99999999.ebuild +++ b/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-cpp + dev-cpp/sdbus-c++ dev-cpp/gtest dev-libs/boost[threads(+)] dev-libs/expat diff --git a/dev-cpp/sdbus-cpp/Manifest b/dev-cpp/sdbus-cpp/Manifest deleted file mode 100644 index 6798b76..0000000 --- a/dev-cpp/sdbus-cpp/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/dev-cpp/sdbus-cpp/files/remove_download_from_external_project-1.patch b/dev-cpp/sdbus-cpp/files/remove_download_from_external_project-1.patch deleted file mode 100644 index 88125f0..0000000 --- a/dev-cpp/sdbus-cpp/files/remove_download_from_external_project-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 811b04abec6140d2996e581c5206cf3bac4c6399 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Mon, 17 Jul 2023 19:12:19 +0300 -Subject: [PATCH] dont clone systemd repo - -Signed-off-by: Alfred Wingate ---- - 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 /* - COMMAND ${MESON} --prefix= --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Drootprefix= -Dstatic-libsystemd=pic -Dselinux=false ${LIBSYSTEMD_EXTRA_CONFIG_OPTS} - BUILD_COMMAND ${BUILD_VERSION_H} --- -2.41.0 - diff --git a/dev-cpp/sdbus-cpp/files/remove_download_from_external_project.patch b/dev-cpp/sdbus-cpp/files/remove_download_from_external_project.patch deleted file mode 100644 index 1ed5c51..0000000 --- a/dev-cpp/sdbus-cpp/files/remove_download_from_external_project.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 /* -+ SOURCE_DIR systemd -+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -E remove /* - COMMAND ${MESON} --prefix= --buildtype=${LIBSYSTEMD_BUILD_TYPE} -Dstatic-libsystemd=pic -Dselinux=false - BUILD_COMMAND ${BUILD_VERSION_H} - COMMAND ${NINJA} -C libsystemd.a diff --git a/dev-cpp/sdbus-cpp/metadata.xml b/dev-cpp/sdbus-cpp/metadata.xml deleted file mode 100644 index e762323..0000000 --- a/dev-cpp/sdbus-cpp/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - parona@protonmail.com - Alfred Wingate - - - Kistler-Group/sdbus-cpp - - diff --git a/dev-cpp/sdbus-cpp/sdbus-cpp-1.2.0.ebuild b/dev-cpp/sdbus-cpp/sdbus-cpp-1.2.0.ebuild deleted file mode 100644 index adda214..0000000 --- a/dev-cpp/sdbus-cpp/sdbus-cpp-1.2.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 -} diff --git a/dev-cpp/sdbus-cpp/sdbus-cpp-1.3.0.ebuild b/dev-cpp/sdbus-cpp/sdbus-cpp-1.3.0.ebuild deleted file mode 100644 index fa675ed..0000000 --- a/dev-cpp/sdbus-cpp/sdbus-cpp-1.3.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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 -} diff --git a/profiles/updates/3Q-2023 b/profiles/updates/3Q-2023 new file mode 100644 index 0000000..c9ef808 --- /dev/null +++ b/profiles/updates/3Q-2023 @@ -0,0 +1 @@ +move dev-cpp/sdbus-cpp dev-cpp/sdbus-c++