commit: f2d9718baa48a98e90754834b467dc61ad2675f0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Oct 4 13:25:29 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Oct 4 13:25:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d9718b
dev-util/lldb: Make xml optional and depend on libxml2 directly Closes: https://bugs.gentoo.org/815361 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-util/lldb/lldb-12.0.1.ebuild | 6 ++++-- dev-util/lldb/lldb-13.0.0.9999.ebuild | 6 ++++-- dev-util/lldb/lldb-13.0.0.ebuild | 6 ++++-- dev-util/lldb/lldb-14.0.0.9999.ebuild | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-util/lldb/lldb-12.0.1.ebuild b/dev-util/lldb/lldb-12.0.1.ebuild index a77e4e911fd..432b152fa27 100644 --- a/dev-util/lldb/lldb-12.0.1.ebuild +++ b/dev-util/lldb/lldb-12.0.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="amd64 arm arm64 x86" -IUSE="+libedit lzma ncurses +python test" +IUSE="+libedit lzma ncurses +python test +xml" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="test" @@ -26,7 +26,8 @@ RDEPEND=" ') ${PYTHON_DEPS} ) - ~sys-devel/clang-${PV}[xml] + xml? ( dev-libs/libxml2:= ) + ~sys-devel/clang-${PV} ~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" BDEPEND=" @@ -56,6 +57,7 @@ src_configure() { -DLLDB_ENABLE_LIBEDIT=$(usex libedit) -DLLDB_ENABLE_PYTHON=$(usex python) -DLLDB_ENABLE_LZMA=$(usex lzma) + -DLLDB_ENABLE_LIBXML2=$(usex xml) -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild index ce8729bdc59..55d8be1e273 100644 --- a/dev-util/lldb/lldb-13.0.0.9999.ebuild +++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug +libedit lzma ncurses +python test" +IUSE="debug +libedit lzma ncurses +python test +xml" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="test" @@ -26,7 +26,8 @@ RDEPEND=" ') ${PYTHON_DEPS} ) - ~sys-devel/clang-${PV}[xml] + xml? ( dev-libs/libxml2:= ) + ~sys-devel/clang-${PV} ~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" BDEPEND=" @@ -59,6 +60,7 @@ src_configure() { -DLLDB_ENABLE_LIBEDIT=$(usex libedit) -DLLDB_ENABLE_PYTHON=$(usex python) -DLLDB_ENABLE_LZMA=$(usex lzma) + -DLLDB_ENABLE_LIBXML2=$(usex xml) -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) diff --git a/dev-util/lldb/lldb-13.0.0.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild index 474e09e9cbd..0369511ea6f 100644 --- a/dev-util/lldb/lldb-13.0.0.ebuild +++ b/dev-util/lldb/lldb-13.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="debug +libedit lzma ncurses +python test" +IUSE="debug +libedit lzma ncurses +python test +xml" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="test" @@ -26,7 +26,8 @@ RDEPEND=" ') ${PYTHON_DEPS} ) - ~sys-devel/clang-${PV}[xml] + xml? ( dev-libs/libxml2:= ) + ~sys-devel/clang-${PV} ~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" BDEPEND=" @@ -59,6 +60,7 @@ src_configure() { -DLLDB_ENABLE_LIBEDIT=$(usex libedit) -DLLDB_ENABLE_PYTHON=$(usex python) -DLLDB_ENABLE_LZMA=$(usex lzma) + -DLLDB_ENABLE_LIBXML2=$(usex xml) -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) diff --git a/dev-util/lldb/lldb-14.0.0.9999.ebuild b/dev-util/lldb/lldb-14.0.0.9999.ebuild index ce8729bdc59..55d8be1e273 100644 --- a/dev-util/lldb/lldb-14.0.0.9999.ebuild +++ b/dev-util/lldb/lldb-14.0.0.9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug +libedit lzma ncurses +python test" +IUSE="debug +libedit lzma ncurses +python test +xml" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="test" @@ -26,7 +26,8 @@ RDEPEND=" ') ${PYTHON_DEPS} ) - ~sys-devel/clang-${PV}[xml] + xml? ( dev-libs/libxml2:= ) + ~sys-devel/clang-${PV} ~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" BDEPEND=" @@ -59,6 +60,7 @@ src_configure() { -DLLDB_ENABLE_LIBEDIT=$(usex libedit) -DLLDB_ENABLE_PYTHON=$(usex python) -DLLDB_ENABLE_LZMA=$(usex lzma) + -DLLDB_ENABLE_LIBXML2=$(usex xml) -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
