commit: c06987beab26b00ad40f854366266bba483ef4fc Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 21 07:46:02 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 21 07:49:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06987be
dev-util/babeltrace: slot 2.x f6f136bbc813ef7a65358e7f5712a3d49395d717 added babeltrace-2.x. Quoting the website: > Because Babeltrace 2 is still a young released project, some distributions > still > provide packages for the Babeltrace 1 project. Both projects can coexist on > the same system as there are no common installed files. At least gdb (bug 951652) and ceph (bug 920371) need porting to babeltrace-2, so let's provide a slotted package. Bug: https://bugs.gentoo.org/951652 Bug: https://bugs.gentoo.org/920371 Closes: https://bugs.gentoo.org/954136 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{babeltrace-2.0.6.ebuild => babeltrace-2.0.6-r1.ebuild} | 10 ++++++---- .../{babeltrace-2.1.1.ebuild => babeltrace-2.1.1-r1.ebuild} | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dev-util/babeltrace/babeltrace-2.0.6.ebuild b/dev-util/babeltrace/babeltrace-2.0.6-r1.ebuild similarity index 93% rename from dev-util/babeltrace/babeltrace-2.0.6.ebuild rename to dev-util/babeltrace/babeltrace-2.0.6-r1.ebuild index 2f489fccdf13..f8e5c3405dde 100644 --- a/dev-util/babeltrace/babeltrace-2.0.6.ebuild +++ b/dev-util/babeltrace/babeltrace-2.0.6-r1.ebuild @@ -12,17 +12,19 @@ SRC_URI="https://www.efficios.com/files/${PN}/${PN}$(ver_cut 1)-${PV}.tar.bz2" S="${WORKDIR}/${PN}$(ver_cut 1)-${PV}" LICENSE="GPL-2" -SLOT="0/$(ver_cut 1)" +SLOT="2/$(ver_cut 1)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="doc +elfutils +man plugins python" REQUIRED_USE="plugins? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=">=dev-libs/glib-2.28:2 +RDEPEND=" + !dev-util/babeltrace:0/2 + >=dev-libs/glib-2.28:2 elfutils? ( >=dev-libs/elfutils-0.154 ) python? ( ${PYTHON_DEPS} ) " - -BDEPEND="${RDEPEND} +BDEPEND=" + ${RDEPEND} >=sys-devel/bison-2.5 app-alternatives/lex python? ( diff --git a/dev-util/babeltrace/babeltrace-2.1.1.ebuild b/dev-util/babeltrace/babeltrace-2.1.1-r1.ebuild similarity index 96% rename from dev-util/babeltrace/babeltrace-2.1.1.ebuild rename to dev-util/babeltrace/babeltrace-2.1.1-r1.ebuild index 283be2d83319..ad0a3e9f87b2 100644 --- a/dev-util/babeltrace/babeltrace-2.1.1.ebuild +++ b/dev-util/babeltrace/babeltrace-2.1.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.efficios.com/files/${PN}/${PN}$(ver_cut 1)-${PV}.tar.bz2" S="${WORKDIR}/${PN}$(ver_cut 1)-${PV}" LICENSE="GPL-2" -SLOT="0/$(ver_cut 1)" +SLOT="2/$(ver_cut 1)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="doc +elfutils +man plugins python" REQUIRED_USE="plugins? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -22,7 +22,10 @@ DEPEND=" elfutils? ( >=dev-libs/elfutils-0.154 ) python? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + !dev-util/babeltrace:0/2 +" BDEPEND=" >=sys-devel/bison-2.5 app-alternatives/lex
