From 2daa3ee8d3774cf9a43337e1b38d2021e3f19e9d Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Thu, 7 Jul 2022 15:13:32 +0300
Subject: [PATCH] dev-cpp/sdbus-cpp: add 1.1.0, remove old

Signed-off-by: Alfred Wingate <parona@protonmail.com>
---
 dev-cpp/sdbus-cpp/Manifest                    |  5 +--
 dev-cpp/sdbus-cpp/sdbus-cpp-0.8.3.ebuild      | 45 -------------------
 ...pp-1.0.0.ebuild => sdbus-cpp-1.1.0.ebuild} | 42 ++++++++++++-----
 3 files changed, 34 insertions(+), 58 deletions(-)
 delete mode 100644 dev-cpp/sdbus-cpp/sdbus-cpp-0.8.3.ebuild
 rename dev-cpp/sdbus-cpp/{sdbus-cpp-1.0.0.ebuild => sdbus-cpp-1.1.0.ebuild} (62%)

diff --git a/dev-cpp/sdbus-cpp/Manifest b/dev-cpp/sdbus-cpp/Manifest
index 4915ec8..3822675 100644
--- a/dev-cpp/sdbus-cpp/Manifest
+++ b/dev-cpp/sdbus-cpp/Manifest
@@ -1,3 +1,2 @@
-DIST sdbus-cpp-0.8.3.tar.gz 190124 BLAKE2B ad7d3872016471c7b8db0f20609e8debb13d155492655561675add60c9c1e9089553c31f7375136ba696112d17a4bd92a947a600a2c9f2842f7c0ba79f38046d SHA512 bdaccd686aeba9f24284c796fac7d0b6d514365e0b757db91e209e1e15c928d9de8ab1d5f5d21671896b07ea762ab4b7c6a5ce0850b17ad08bacb0f1a668cfb2
-DIST sdbus-cpp-1.0.0.tar.gz 202061 BLAKE2B 38a73b4c538e4bc64a21cabb1a5e3abdfca52b0d5785e11a55aef59271e772435c6d6844e605ebebb398d09ace565b13f201cd62217a7174a4d9d9be24ef8e6b SHA512 dc6b6c4945f5203ad5e4d86ae78088ce367a5ee28f3bb1c17c116c0755d9b221685a92b32dd9e354351067b012768e8d42ebe5dac93199d1384b9b4dadec09ef
-DIST systemd-stable-242.tar.gz 7831827 BLAKE2B cdcb2cb2b2b7b05eb8509faaf9bd5c11fdbab316c4ae61492e1eb5f405c9b2c527acc7105efad13cde1e877febe401a313e3dd43cec4f04aa5a4ea939f20f9a3 SHA512 607d41ce212ea320f51ad3729d86b4b2fb6a3ed78ff493ffe095ac9a7d7b27e56910c1b941c15c2e574b5e8fd8e72ab1d53870112ce604958a717a2f870290ff
+DIST sdbus-cpp-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
+DIST systemd-stable-251.tar.gz 11432310 BLAKE2B a525a07a143b6c25b97c2ef510ca38ad7c752b96d7efd073a714d6750fbb8309ab926a6415988eeb195104319484fa2476f5dd486673cc848e24cadbd76744da SHA512 9a67136b1fc6600881b2b1a1d89185e5e48ab600a9226b1f27229f8d87c1afc9a1502095f2e26dff3bf0de8f4780293d6b3f78536357859cbfc4bec62d425125
diff --git a/dev-cpp/sdbus-cpp/sdbus-cpp-0.8.3.ebuild b/dev-cpp/sdbus-cpp/sdbus-cpp-0.8.3.ebuild
deleted file mode 100644
index 56e0110..0000000
--- a/dev-cpp/sdbus-cpp/sdbus-cpp-0.8.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="High-level C++ D-Bus library for Linux"
-HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp/"
-
-SYSTEMDVER="242"
-SRC_URI="
-	https://github.com/Kistler-Group/sdbus-cpp/archive/v"${PV}".tar.gz -> sdbus-cpp-"${PV}".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="systemd"
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CMAKE_MAKEFILE_GENERATOR=emake # ninja cant handle external projects for some reason
-
-PATCHES=( "${FILESDIR}/remove_download_from_external_project.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 # possibly could be use controlled instead
-		-DBUILD_LIBSYSTEMD=$(usex !systemd)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/sdbus-cpp/sdbus-cpp-1.0.0.ebuild b/dev-cpp/sdbus-cpp/sdbus-cpp-1.1.0.ebuild
similarity index 62%
rename from dev-cpp/sdbus-cpp/sdbus-cpp-1.0.0.ebuild
rename to dev-cpp/sdbus-cpp/sdbus-cpp-1.1.0.ebuild
index f1145dc..4ca4f75 100644
--- a/dev-cpp/sdbus-cpp/sdbus-cpp-1.0.0.ebuild
+++ b/dev-cpp/sdbus-cpp/sdbus-cpp-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,26 +8,36 @@ inherit cmake
 DESCRIPTION="High-level C++ D-Bus library for Linux"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp/"
 
-SYSTEMDVER="242"
+SYSTEMDVER="251"
 SRC_URI="
-	https://github.com/Kistler-Group/sdbus-cpp/archive/v${PV}.tar.gz -> sdbus-cpp-"${PV}".tar.gz
+	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="systemd"
+IUSE="doc examples systemd test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="
+CDEPEND="
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
+	${CDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+RDEPEND="
+	${CDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-apps/dbus
+	)
 "
-
-CMAKE_MAKEFILE_GENERATOR=emake # ninja cant handle external projects for some reason
 
 PATCHES=( "${FILESDIR}/remove_download_from_external_project.patch" )
 
@@ -38,8 +48,20 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_CODE_GEN=ON # possibly could be use controlled instead
+		-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
+}