commit: 7ed83c64a2ca130e3019c58b945230c1f734060b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 1 16:12:37 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 1 16:12:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed83c64
dev-libs/dbus-glib: drop 0.110 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/dbus-glib/Manifest | 1 - dev-libs/dbus-glib/dbus-glib-0.110.ebuild | 107 --------------------- .../dbus-glib-0.110-config-glib-genmarshal.conf | 76 --------------- 3 files changed, 184 deletions(-) diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest index c30e3135cb62..1c633be509ac 100644 --- a/dev-libs/dbus-glib/Manifest +++ b/dev-libs/dbus-glib/Manifest @@ -1,2 +1 @@ -DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54 DIST dbus-glib-0.112.tar.gz 715340 BLAKE2B 24e1c222f0116b32c109682816f6c35771647f4c63cab93a6621bd68b71ea4dca62fbf9e6bb360386b8658146dbf34b0d7dc471db7525585412d120340c4c969 SHA512 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild deleted file mode 100644 index 3c833833f1fc..000000000000 --- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs - -DESCRIPTION="D-Bus bindings for glib" -HOMEPAGE="https://dbus.freedesktop.org/"; -SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"; - -LICENSE="|| ( GPL-2 AFL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug static-libs test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - >=sys-apps/dbus-1.8[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-libs/expat-2.1.0-r3 - >=dev-libs/glib-2.40:2 - >=sys-apps/dbus-1.8 - >=dev-util/glib-utils-2.40 - >=dev-build/gtk-doc-am-1.14 - virtual/pkgconfig -" # CBUILD dependencies are needed to make a native tool while cross-compiling. - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf ) - -set_TBD() { - # out of sources build dir for make check - export TBD="${BUILD_DIR}-tests" -} - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myconf=( - --localstatedir="${EPREFIX}"/var - --enable-bash-completion - --disable-gtk-doc - $(use_enable debug asserts) - $(use_enable static-libs static) - ) - - # Configure a CBUILD directory to make a native build tool. - if tc-is-cross-compiler; then - mkdir "${BUILD_DIR}-build" || die - cd "${BUILD_DIR}-build" || die - ECONF_SOURCE="${S}" econf_build - myconf+=( --with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" ) - cd - || die - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - ln -s "${S}"/doc/reference/html doc/reference/html || die #460042 - - if use test; then - set_TBD - mkdir "${TBD}" || die - cd "${TBD}" || die - einfo "Running configure in ${TBD}" - ECONF_SOURCE="${S}" econf \ - "${myconf[@]}" \ - $(use_enable test checks) \ - $(use_enable test tests) \ - $(use_enable test asserts) - fi -} - -multilib_src_compile() { - tc-is-cross-compiler && emake -C "${BUILD_DIR}-build" - - emake - - if use test; then - set_TBD - cd "${TBD}" || die - einfo "Running make in ${TBD}" - emake - fi -} - -multilib_src_test() { - set_TBD - cd "${TBD}" || die - emake check -} - -multilib_src_install_all() { - einstalldocs - - newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send - rm -rf "${ED}"/etc/bash_completion.d || die - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf deleted file mode 100644 index 463638710ad0..000000000000 --- a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf +++ /dev/null @@ -1,76 +0,0 @@ -From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -Date: Sun, 2 Dec 2018 16:26:07 +0100 -Subject: [PATCH] buildsys: use variable for glib-genmarshal - -When doing cross-compilation, the path returned by pkg-config for -glib-genmarshal can be incorrect (because it is the runtime path, -not the build-time path). - -Change configure.ac to use pkg-config to get the variable. - -This allows overridig the path at configure time, by using the configure -option GLIB_GENMARSHAL=/path/toglib-genmarshal - -Signed-off-by: "Yann E. MORIN" <[email protected]> -[smcv: Fix typo in commit message] -Reviewed-by: Simon McVittie <[email protected]> ---- - configure.ac | 4 ++-- - dbus/Makefile.am | 4 ++-- - dbus/examples/statemachine/Makefile.am | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e00bc38..8be3147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], - [Warn on use of APIs deprecated before GLib 2.32]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40]) - --GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` --AC_SUBST(GLIB_GENMARSHAL) -+PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],, -+ [AC_MSG_ERROR([cannot find glib-genmarshal])]) - - dnl GLib flags - AC_SUBST(GLIB_CFLAGS) -diff --git a/dbus/Makefile.am b/dbus/Makefile.am -index 37c6334..2e8cb27 100644 ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1 - ## we just rebuilt these manually and check them into cvs; easier than - ## convincing automake/make to do this properly - regenerate-built-sources: -- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \ -+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \ - echo '#include <config.h>' > dbus-gmarshal.c && \ - echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \ -- @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c -+ $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c - - - completiondir = $(sysconfdir)/bash_completion.d -diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am -index 187b044..c8fe029 100644 ---- a/dbus/examples/statemachine/Makefile.am -+++ b/dbus/examples/statemachine/Makefile.am -@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml - - sm-marshal.c: Makefile sm-marshal.list - echo "#include <config.h>" > [email protected] -- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> [email protected] -+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> [email protected] - mv [email protected] $@ - - sm-marshal.h: Makefile sm-marshal.list -- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > [email protected] && mv [email protected] $@ -+ $(GLIB_GENMARSHAL) --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > [email protected] && mv [email protected] $@ - - BUILT_SOURCES += sm-marshal.c sm-marshal.h - --- -GitLab -
