* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2022-03-21 21:48 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2022-03-21 21:48 UTC (permalink / raw
To: gentoo-commits
commit: e1216ad522c5b134dc5d666882af155a46b7e23b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 21:48:21 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 21:48:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1216ad5
dev-cpp/sdbus-c++: Use python-any-r1 eclass to build systemd
Closes: https://bugs.gentoo.org/835705
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild | 15 ++++++++++++++-
dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild | 15 ++++++++++++++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
index 2e96c31113c1..04f6c85c5a16 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-inherit meson cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
SDP="systemd-stable-250.4"
DESCRIPTION="High-level C++ D-Bus library"
@@ -34,12 +35,24 @@ DEPEND="
BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )
+ !systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ )
"
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
S="${WORKDIR}/sdbus-cpp-${PV}"
SDS="${WORKDIR}/${SDP}"
SDB="${WORKDIR}/systemd-build"
+pkg_setup() {
+ use systemd || python-any-r1_pkg_setup
+}
+
src_prepare() {
if ! use systemd; then
pushd "${SDS}" || die
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
index 454cc5196d10..7eee346da844 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-inherit meson cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 meson cmake
SDP="systemd-stable-250.4"
DESCRIPTION="High-level C++ D-Bus library"
@@ -34,8 +35,16 @@ DEPEND="
BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )
+ !systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ )
"
+python_check_deps() {
+ has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
S="${WORKDIR}/sdbus-cpp-${PV}"
SDS="${WORKDIR}/${SDP}"
SDB="${WORKDIR}/systemd-build"
@@ -44,6 +53,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-gtest-1.11.patch
)
+pkg_setup() {
+ use systemd || python-any-r1_pkg_setup
+}
+
src_prepare() {
if ! use systemd; then
pushd "${SDS}" || die
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2022-04-02 13:52 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2022-04-02 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 09bdb6811f97dd040d8854c1296580c9bea5a5a8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 13:51:08 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 13:52:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bdb681
dev-cpp/sdbus-c++: Apply Gentoo musl patches to systemd
This downgrades systemd slightly but the precise version isn't too important.
This is admittedly not tested against musl. Hopefully it's sufficient.
Closes: https://bugs.gentoo.org/836414
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/Manifest | 3 ++-
.../{sdbus-c++-0.9.0.ebuild => sdbus-c++-0.9.0-r1.ebuild} | 13 +++++++++++--
.../{sdbus-c++-1.1.0.ebuild => sdbus-c++-1.1.0-r1.ebuild} | 13 +++++++++++--
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index fd0c4fb8f9c5..a1645906706d 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,3 +1,4 @@
DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
-DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
+DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild
similarity index 88%
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild
index 04f6c85c5a16..fde2a90c6d5e 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild
@@ -6,11 +6,19 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.5"
+MUSL_PATCHSET="249.5-r1"
+
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- !systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+ !systemd? (
+ https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz
+ elibc_musl? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ )
+ )"
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
SLOT="0/0"
KEYWORDS="~amd64"
@@ -56,6 +64,7 @@ pkg_setup() {
src_prepare() {
if ! use systemd; then
pushd "${SDS}" || die
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches
eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
popd || die
fi
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild
similarity index 88%
rename from dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild
index 7eee346da844..df550152fd34 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild
@@ -6,11 +6,19 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-250.4"
+SDP="systemd-stable-249.5"
+MUSL_PATCHSET="249.5-r1"
+
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- !systemd? ( https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz )"
+ !systemd? (
+ https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz
+ elibc_musl? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ )
+ )"
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
SLOT="0/1"
KEYWORDS="~amd64"
@@ -60,6 +68,7 @@ pkg_setup() {
src_prepare() {
if ! use systemd; then
pushd "${SDS}" || die
+ use elibc_musl && eapply "${WORKDIR}"/musl-patches
eapply "${FILESDIR}"/${PN}-static-libsystemd.patch
popd || die
fi
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2022-04-02 20:54 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2022-04-02 20:54 UTC (permalink / raw
To: gentoo-commits
commit: a050752ec632ed0e462b3195648ed2869bb0eca8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 20:53:51 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 20:53:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a050752e
dev-cpp/sdbus-c++: Fix systemd SRC_URI
systemd is confusing.
Closes: https://bugs.gentoo.org/836655
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/Manifest | 2 +-
.../{sdbus-c++-0.9.0-r1.ebuild => sdbus-c++-0.9.0-r2.ebuild} | 4 ++--
.../{sdbus-c++-1.1.0-r1.ebuild => sdbus-c++-1.1.0-r2.ebuild} | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index a1645906706d..a60935fdd790 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +1,4 @@
DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
+DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
similarity index 97%
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
index fde2a90c6d5e..0dcc953b32f4 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r1.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -6,14 +6,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-249.5"
+SDP="systemd-stable-249.11"
MUSL_PATCHSET="249.5-r1"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
!systemd? (
- https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz
+ https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
elibc_musl? (
https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
similarity index 97%
rename from dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
index df550152fd34..acaaad6ab19a 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r1.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -6,14 +6,14 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-249.5"
+SDP="systemd-stable-249.11"
MUSL_PATCHSET="249.5-r1"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
!systemd? (
- https://github.com/systemd/systemd/archive/v${SDP##*-}/${SDP}.tar.gz
+ https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
elibc_musl? (
https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2022-05-01 21:04 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2022-05-01 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 9932eeac53ced51c9ea4e560191c35addabd73d2
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 21:03:55 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 1 21:03:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9932eeac
dev-cpp/sdbus-c++: Fix musl build by disabling systemd features
I have disabled these features unconditionally as I don't think they're needed,
regardless of whether you're using musl.
Closes: https://bugs.gentoo.org/841749
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild | 5 ++++-
dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
index 0dcc953b32f4..c5d7db3dcb17 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -81,7 +81,10 @@ src_configure() {
--includedir "${SDP}/src" \
-Drootlibdir="${SDB}" \
-Dselinux=false \
- -Dstatic-libsystemd=pic
+ -Dstatic-libsystemd=pic \
+ -Dgshadow=false \
+ -Dsmack=false \
+ -Dutmp=false
# systemd doesn't generate the needed pkg-config file during configure.
BUILD_DIR=${SDB} \
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
index acaaad6ab19a..17152a67a98c 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -85,7 +85,10 @@ src_configure() {
--includedir "${SDP}/src" \
-Drootlibdir="${SDB}" \
-Dselinux=false \
- -Dstatic-libsystemd=pic
+ -Dstatic-libsystemd=pic \
+ -Dgshadow=false \
+ -Dsmack=false \
+ -Dutmp=false
# systemd doesn't generate the needed pkg-config file during configure.
BUILD_DIR=${SDB} \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2022-05-29 12:53 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2022-05-29 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 60aaa322977a687a4949866a09f38bbd72ce90d4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 12:51:41 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 29 12:52:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60aaa322
dev-cpp/sdbus-c++: Bump systemd version to 250.6
This avoids direct use of ld by the EFI feature, which is unused here anyway.
Closes: https://bugs.gentoo.org/836687
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/Manifest | 4 ++--
.../{sdbus-c++-0.9.0-r2.ebuild => sdbus-c++-0.9.0-r3.ebuild} | 9 +++++----
.../{sdbus-c++-1.1.0-r2.ebuild => sdbus-c++-1.1.0-r3.ebuild} | 9 +++++----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index a60935fdd790..1a00744858e0 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +1,4 @@
DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
-DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
+DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
similarity index 94%
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
index c5d7db3dcb17..29193a2602d6 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-249.11"
-MUSL_PATCHSET="249.5-r1"
+SDP="systemd-stable-250.6"
+MUSL_PATCHSET="250.4"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,8 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
!systemd? (
https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
elibc_musl? (
- https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
- https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
)
)"
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
similarity index 94%
rename from dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
index 17152a67a98c..29fe7c8f37f6 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 meson cmake
-SDP="systemd-stable-249.11"
-MUSL_PATCHSET="249.5-r1"
+SDP="systemd-stable-250.6"
+MUSL_PATCHSET="250.4"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,8 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
!systemd? (
https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
elibc_musl? (
- https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
- https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+ https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
)
)"
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2023-02-18 21:55 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2023-02-18 21:55 UTC (permalink / raw
To: gentoo-commits
commit: bbc74550e02b3fe214e0e9293d03fbf0cfd12560
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 21:54:57 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 21:54:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc74550
dev-cpp/sdbus-c++: Really fix musl with __UAPI_DEF_ETHHDR
Closes: https://bugs.gentoo.org/895284
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild | 5 ++++-
dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
index a51620da4851..4ad16b14b087 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 meson cmake
+inherit python-any-r1 meson cmake flag-o-matic
SDP="systemd-stable-252.6"
MUSL_PATCHSET="systemd-musl-patches-252.4"
@@ -79,6 +79,9 @@ src_prepare() {
src_configure() {
if ! use systemd; then
+ # Avoid redefinition of struct ethhdr.
+ use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
+
EMESON_SOURCE=${SDS} \
BUILD_DIR=${SDB} \
meson_src_configure \
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
index 14aec38d9337..56e8e1beb44e 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 meson cmake
+inherit python-any-r1 meson cmake flag-o-matic
SDP="systemd-stable-252.6"
MUSL_PATCHSET="systemd-musl-patches-252.4"
@@ -80,6 +80,9 @@ src_prepare() {
src_configure() {
if ! use systemd; then
+ # Avoid redefinition of struct ethhdr.
+ use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
+
EMESON_SOURCE=${SDS} \
BUILD_DIR=${SDB} \
meson_src_configure \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2023-09-02 9:01 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2023-09-02 9:01 UTC (permalink / raw
To: gentoo-commits
commit: df8b5047e0cc83cd553b630c7b0c4f59fd94416a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 08:34:27 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 09:01:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8b5047
dev-cpp/sdbus-c++: Bump systemd version for 0.9.0
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/Manifest | 4 ++--
.../{sdbus-c++-0.9.0-r5.ebuild => sdbus-c++-0.9.0-r6.ebuild} | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index dce128efad4d..4cfcbb920a4e 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1,4 +1,4 @@
DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
DIST sdbus-c++-1.3.0.tar.gz 217150 BLAKE2B aa9a902cdff6a6f2268cfe04b45105ab08ee4b3a257db10af63f8224a9932e28c5f755879c866274722a2087a59c0a22dc0616ac5d696229daeaa965a156e220 SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2
-DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
-DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37
+DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
+DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild
similarity index 97%
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild
index 4ad16b14b087..9e5abbf648df 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r5.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild
@@ -3,11 +3,11 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit python-any-r1 meson cmake flag-o-matic
-SDP="systemd-stable-252.6"
-MUSL_PATCHSET="systemd-musl-patches-252.4"
+SDP="systemd-stable-253.7"
+MUSL_PATCHSET="systemd-musl-patches-253.3"
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2024-01-22 23:15 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2024-01-22 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 12adb8665cbb05a091c5b4a580aa9f7ba30cfe3f
Author: lch361 <lch361 <AT> skiff <DOT> com>
AuthorDate: Sun Jan 21 08:26:20 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 23:01:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12adb866
dev-cpp/sdbus-c++: Support sys-libs/basu in place of elogind or systemd
Closes: https://github.com/gentoo/gentoo/pull/34936
Signed-off-by: lch361 <lch361 <AT> skiff.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild
index 287759bdb75c..1a1fadc23426 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild
@@ -12,12 +12,13 @@ LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exce
SLOT="0/1"
KEYWORDS="~amd64"
IUSE="doc +elogind systemd test tools"
-REQUIRED_USE="^^ ( elogind systemd )"
+REQUIRED_USE="?? ( elogind systemd )"
RESTRICT="!test? ( test )"
RDEPEND="
elogind? ( >=sys-auth/elogind-236 )
systemd? ( >=sys-apps/systemd-236:= )
+ !elogind? ( !systemd? ( >=sys-libs/basu-0.2.1 ) )
tools? ( dev-libs/expat )
"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2024-10-29 21:47 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2024-10-29 21:47 UTC (permalink / raw
To: gentoo-commits
commit: b9c80184138cfcaab884047966d11bb7d77c8fd2
Author: John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Sat Oct 26 18:56:12 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 21:43:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c80184
dev-cpp/sdbus-c++: add 2.0.0
Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/Manifest | 1 +
dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild | 74 ++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 3a391a21c399..4eef5e11aabf 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -1 +1,2 @@
DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76
+DIST sdbus-c++-2.0.0.tar.gz 243202 BLAKE2B 946a7d87b882ae44843864311fc93ddf010a4f3fe3d341fb5d3f05890f2693d341082007db94f57eee06bf60e3f3a1adc35e63bbf057883b4a6d0b466791def0 SHA512 638453d2ea0d5ba556eacda59ca114896bf275d227b33b525259bf69dac3d766df6586046e6ea83a8c1afe9fb0701f4d358819ed9300bab598e775a0a2880917
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
new file mode 100644
index 000000000000..3ad7269f044c
--- /dev/null
+++ b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson cmake
+
+DESCRIPTION="High-level C++ D-Bus library"
+HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
+SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
+SLOT="0/2"
+KEYWORDS="~amd64"
+IUSE="doc +elogind systemd test tools"
+REQUIRED_USE="?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ elogind? ( >=sys-auth/elogind-252 )
+ systemd? ( >=sys-apps/systemd-252:= )
+ !elogind? ( !systemd? ( >=sys-libs/basu-0.2.1 ) )
+ tools? ( dev-libs/expat )
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.14.0 )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen[dot] )
+"
+
+S="${WORKDIR}/sdbus-cpp-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DSDBUSCPP_BUILD_CODEGEN=$(usex tools)
+ -DSDBUSCPP_BUILD_DOCS=yes
+ -DSDBUSCPP_BUILD_DOXYGEN_DOCS=$(usex doc)
+ -DSDBUSCPP_BUILD_LIBSYSTEMD=no
+ -DSDBUSCPP_BUILD_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+ if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then
+ ewarn "Not running the tests as a D-Bus configuration file has not been"
+ ewarn "installed yet or has changed since. The tests can be run after"
+ ewarn "the package has been merged."
+ return
+ elif [[ ! -S /run/dbus/system_bus_socket ]]; then
+ ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable."
+ return
+ fi
+
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+ if use test; then
+ # Delete installed test binaries.
+ rm -rv "${ED}"/usr/tests || die
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/
@ 2024-10-29 21:47 James Le Cuirot
0 siblings, 0 replies; 10+ messages in thread
From: James Le Cuirot @ 2024-10-29 21:47 UTC (permalink / raw
To: gentoo-commits
commit: ba94c02c1b1d1a1d87b086a5ec2924cc9b7ae7c3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 21:45:36 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 21:45:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba94c02c
dev-cpp/sdbus-c++: Fix building docs and running tests
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
index 3ad7269f044c..24a9ea5018f8 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-2.0.0.ebuild
@@ -8,6 +8,8 @@ inherit meson cmake
DESCRIPTION="High-level C++ D-Bus library"
HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sdbus-cpp-${PV}"
+
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
SLOT="0/2"
KEYWORDS="~amd64"
@@ -32,10 +34,9 @@ BDEPEND="
doc? ( app-text/doxygen[dot] )
"
-S="${WORKDIR}/sdbus-cpp-${PV}"
-
src_configure() {
local mycmakeargs=(
+ -DBUILD_DOXYGEN_DOC=$(usex doc)
-DSDBUSCPP_BUILD_CODEGEN=$(usex tools)
-DSDBUSCPP_BUILD_DOCS=yes
-DSDBUSCPP_BUILD_DOXYGEN_DOCS=$(usex doc)
@@ -60,7 +61,9 @@ src_test() {
return
fi
- cmake_src_test
+ # Can't use cmake_src_test with dbus-run-session. Don't bother with all the
+ # extra arguments because there's only two tests.
+ dbus-run-session ctest --test-dir "${BUILD_DIR}" || die
}
src_install() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-10-29 21:47 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-22 23:15 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-10-29 21:47 James Le Cuirot
2024-10-29 21:47 James Le Cuirot
2023-09-02 9:01 James Le Cuirot
2023-02-18 21:55 James Le Cuirot
2022-05-29 12:53 James Le Cuirot
2022-05-01 21:04 James Le Cuirot
2022-04-02 20:54 James Le Cuirot
2022-04-02 13:52 James Le Cuirot
2022-03-21 21:48 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox