commit:     c306d9f376e4aaab82d817d899f402118c9c2072
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 14:38:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 14:45:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c306d9f3

dev-util/build2: Remove last-rited pkg

Closes: https://bugs.gentoo.org/924587
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/build2/Manifest                           |   3 -
 dev-util/build2/build2-0.13.0.ebuild               | 127 ------------------
 dev-util/build2/build2-0.14.0.ebuild               | 144 ---------------------
 dev-util/build2/build2-0.16.0.ebuild               | 143 --------------------
 ...mol-vtable-for-match_any_but_newline-exec.patch |  38 ------
 ...ild2-0.13.0_alpha0_pre20200710-nousrlocal.patch |  52 --------
 .../files/build2-0.14.0-update-for-install.patch   |  12 --
 dev-util/build2/metadata.xml                       |  31 -----
 profiles/package.mask                              |   1 -
 9 files changed, 551 deletions(-)

diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
deleted file mode 100644
index 025ba8f3b810..000000000000
--- a/dev-util/build2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
-DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
-DIST build2-toolchain-0.16.0.tar.xz 5545392 BLAKE2B 
daefa8745cd342b0de7d74c3b66e3811b95fec9b8c14b29b1fd030d796a31586e0ef401b296cdae5a2d27cf9c337092b707e5fb0673356edff35800bb4be5004
 SHA512 
f926f3be07287ae8d0ff44e04fdee8c80982db2fa9e33012afb3fe21ee6973d771a3df33a7b976cc714c905d443020501dc96ea3546c76600760c3574e6ae625

diff --git a/dev-util/build2/build2-0.13.0.ebuild 
b/dev-util/build2/build2-0.13.0.ebuild
deleted file mode 100644
index be9a2ab78a0a..000000000000
--- a/dev-util/build2/build2-0.13.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz";
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       ~dev-cpp/libodb-2.5.0_beta19
-       ~dev-cpp/libodb-sqlite-2.5.0_beta19
-       dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
-       
"${FILESDIR}"/${PN}-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-b() {
-       local myargs=(
-               --jobs $(makeopts_jobs)
-               --verbose 3
-       )
-       export 
LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-       set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-       echo "${@}"
-       "${@}" || die "${@} failed"
-}
-
-src_prepare() {
-       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-               "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 
--libs)" \
-               "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-               libodb-sqlite/buildfile \
-               || die
-       sed \
-               -e 's:libsqlite3[/]\?::' \
-               -i buildfile build/bootstrap.build \
-               || die
-
-       for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-                          "${i}" \
-                       || die
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-                          "${i}" \
-                       || die
-       done
-       sed \
-               -e 's:libodb[/]\?::' \
-               -e 's:libodb-sqlite[/]\?::' \
-               -i buildfile build/bootstrap.build \
-               || die
-
-       if has_version dev-util/pkgconf; then
-               for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-                       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
-                               "${i}" \
-                               || die
-               done
-               sed \
-                       -e 's:libpkgconf[/]\?::' \
-                       -i buildfile build/bootstrap.build \
-                       || die
-       fi
-
-       default
-}
-
-src_configure() {
-       emake -C build2 -f bootstrap.gmake \
-               CXX=$(tc-getCXX) \
-               CXXFLAGS="${CXXFLAGS}" \
-               LDFLAGS="${LDFLAGS}"
-
-       b configure \
-               config.cxx="$(tc-getCXX)" \
-               config.cxx.coptions="${CXXFLAGS}" \
-               config.cxx.loptions="${LDFLAGS}" \
-               config.c="$(tc-getCC)" \
-               config.cc.coptions="${CFLAGS}" \
-               config.cc.loptions="${LDFLAGS}" \
-               config.bin.ar="$(tc-getAR)" \
-               config.bin.ranlib="$(tc-getRANLIB)" \
-               config.bin.lib=shared \
-               config.install.root="${EPREFIX}"/usr \
-               config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-               config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-       b update-for-install
-       use test && b update-for-test
-}
-
-src_test() {
-       b test
-}
-
-src_install() {
-       b install \
-               config.install.chroot="${D}"
-       mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-       mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml 
"${ED}"/usr/share/doc/${PF}/html || die
-}

diff --git a/dev-util/build2/build2-0.14.0.ebuild 
b/dev-util/build2/build2-0.14.0.ebuild
deleted file mode 100644
index 7382fef53347..000000000000
--- a/dev-util/build2/build2-0.14.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz";
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       ~dev-cpp/libodb-2.5.0_beta21
-       ~dev-cpp/libodb-sqlite-2.5.0_beta21
-       dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
-       "${FILESDIR}"/${PN}-0.14.0-update-for-install.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-b() {
-       local myargs=(
-               --jobs $(makeopts_jobs)
-               --verbose 3
-       )
-       export 
LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-       set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-       echo "${@}"
-       "${@}" || die "${@} failed"
-}
-
-src_prepare() {
-       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-               "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 
--libs)" \
-               "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-               libodb-sqlite/buildfile \
-               || die
-       sed \
-               -e 's:libsqlite3[/]\?::' \
-               -i buildfile build/bootstrap.build \
-               || die
-
-       for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-                          "${i}" \
-                       || die
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-                          "${i}" \
-                       || die
-       done
-       sed \
-               -e 's:libodb[/]\?::' \
-               -e 's:libodb-sqlite[/]\?::' \
-               -i buildfile build/bootstrap.build \
-               || die
-
-       if has_version dev-util/pkgconf; then
-               for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-                       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
-                               "${i}" \
-                               || die
-               done
-               sed \
-                       -e 's:libpkgconf[/]\?::' \
-                       -i buildfile build/bootstrap.build \
-                       || die
-       fi
-
-       default
-}
-
-src_configure() {
-       emake -C build2 -f bootstrap.gmake \
-               CXX=$(tc-getCXX) \
-               CXXFLAGS="${CXXFLAGS}" \
-               LDFLAGS="${LDFLAGS}"
-
-       b configure \
-               config.cxx="$(tc-getCXX)" \
-               config.cxx.coptions="${CXXFLAGS}" \
-               config.cxx.loptions="${LDFLAGS}" \
-               config.c="$(tc-getCC)" \
-               config.cc.coptions="${CFLAGS}" \
-               config.cc.loptions="${LDFLAGS}" \
-               config.bin.ar="$(tc-getAR)" \
-               config.bin.ranlib="$(tc-getRANLIB)" \
-               config.bin.lib=shared \
-               config.install.root="${EPREFIX}"/usr \
-               config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-               config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-       b update-for-install
-       use test && b update-for-test
-}
-
-src_test() {
-       b test
-}
-
-src_install() {
-       b install: build2/ bpkg/ bdep/ libbuild2-kconfig/ \
-               config.install.chroot="${D}"
-       rm -rf "${ED}"/usr/include/odb \
-          "${ED}"/usr/include/pkgconf/libpkgconf \
-               || die
-       rm -f "${ED}"/usr/include/sqlite3.h \
-          "${ED}"/usr/include/sqlite3ext.h \
-          "${ED}"/usr/$(get_libdir)/libodb.so \
-          "${ED}"/usr/$(get_libdir)/libodb-*.so \
-          "${ED}"/usr/$(get_libdir)/libodb-sqlite.so \
-          "${ED}"/usr/$(get_libdir)/libodb-sqlite-*.so \
-          "${ED}"/usr/$(get_libdir)/libpkgconf.so \
-          "${ED}"/usr/$(get_libdir)/libsqlite3.so \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.shared.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.shared.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libpkgconf.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.pc \
-          || die
-       mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-       mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml 
"${ED}"/usr/share/doc/${PF}/html || die
-}

diff --git a/dev-util/build2/build2-0.16.0.ebuild 
b/dev-util/build2/build2-0.16.0.ebuild
deleted file mode 100644
index e823b9f35655..000000000000
--- a/dev-util/build2/build2-0.16.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=build2-toolchain
-MY_P="${MY_PN}-${PV}"
-
-inherit toolchain-funcs multiprocessing
-
-DESCRIPTION="Cross-platform toolchain for building and packaging C++ code"
-HOMEPAGE="https://build2.org";
-SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz";
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       ~dev-cpp/libodb-2.5.0_beta25
-       ~dev-cpp/libodb-sqlite-2.5.0_beta25
-       dev-db/sqlite:3
-"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-0.14.0-update-for-install.patch
-)
-
-b() {
-       local myargs=(
-               --jobs $(makeopts_jobs)
-               --verbose 3
-       )
-       export 
LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
-       set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
-       echo "${@}"
-       "${@}" || die "${@} failed"
-}
-
-src_prepare() {
-       # Unbundle dev-cpp/libodb and dev-cpp/libodb-sqlite
-       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-               "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 
--libs)" \
-               "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
-               libodb-sqlite/buildfile \
-               || die
-       sed -i \
-               -e 's:libsqlite3[/]\?::' \
-               buildfile build/bootstrap.build \
-               || die
-       for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
-                          "${i}" \
-                       || die
-               printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
-                          "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
-                          "${i}" \
-                       || die
-       done
-       sed -i \
-               -e 's:libodb-sqlite[/]\?::' \
-               -e 's:libodb[/]\?::' \
-               buildfile build/bootstrap.build \
-               || die
-
-       if has_version dev-util/pkgconf; then
-               for i in build2/build2/buildfile build2/libbuild2/buildfile; do
-                       printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
-                               "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
-                               "${i}" \
-                               || die
-               done
-               sed \
-                       -e 's:libpkgconf[/]\?::' \
-                       -i buildfile build/bootstrap.build \
-                       || die
-       fi
-
-       default
-}
-
-src_configure() {
-       emake -C build2 -f bootstrap.gmake \
-               CXX=$(tc-getCXX) \
-               CXXFLAGS="${CXXFLAGS}" \
-               LDFLAGS="${LDFLAGS}"
-
-       b configure \
-               config.cxx="$(tc-getCXX)" \
-               config.cxx.coptions="${CXXFLAGS}" \
-               config.cxx.loptions="${LDFLAGS}" \
-               config.c="$(tc-getCC)" \
-               config.cc.coptions="${CFLAGS}" \
-               config.cc.loptions="${LDFLAGS}" \
-               config.bin.ar="$(tc-getAR)" \
-               config.bin.ranlib="$(tc-getRANLIB)" \
-               config.bin.lib=shared \
-               config.install.root="${EPREFIX}"/usr \
-               config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
-               config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-       b update-for-install
-       use test && b update-for-test
-}
-
-src_test() {
-       b test
-}
-
-src_install() {
-       b install: build2/ bpkg/ bdep/ libbuild2-kconfig/ \
-               config.install.chroot="${D}"
-       rm -rf "${ED}"/usr/include/odb \
-          "${ED}"/usr/include/pkgconf/libpkgconf \
-               || die
-       rm -f "${ED}"/usr/include/sqlite3.h \
-          "${ED}"/usr/include/sqlite3ext.h \
-          "${ED}"/usr/$(get_libdir)/libodb.so \
-          "${ED}"/usr/$(get_libdir)/libodb-*.so \
-          "${ED}"/usr/$(get_libdir)/libodb-sqlite.so \
-          "${ED}"/usr/$(get_libdir)/libodb-sqlite-*.so \
-          "${ED}"/usr/$(get_libdir)/libpkgconf.so \
-          "${ED}"/usr/$(get_libdir)/libsqlite3.so \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.shared.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb-sqlite.shared.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libpkgconf.pc \
-          "${ED}"/usr/$(get_libdir)/pkgconfig/libodb.pc \
-          || die
-       mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
-       mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml 
"${ED}"/usr/share/doc/${PF}/html || die
-}

diff --git 
a/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 
b/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
deleted file mode 100644
index 00b685600c8e..000000000000
--- 
a/dev-util/build2/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx     
2020-06-10 19:25:37.000000000 +1000
-+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx  2020-08-10 
14:00:05.698012838 +1000
-@@ -5,6 +5,35 @@
- 
- #include <libbuild2/script/regex.hxx>
- 
-+#if defined(_LIBCPP_VERSION)
-+template <>
-+void
-+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__exec(__state&
 __s) const
-+{
-+  if (__s.__current_ != __s.__last_)
-+  {
-+    switch (*__s.__current_)
-+    {
-+      case '\r':
-+      case '\n':
-+        __s.__do_ = __state::__reject;
-+        __s.__node_ = nullptr;
-+        break;
-+      default:
-+        __s.__do_ = __state::__accept_and_consume;
-+        ++__s.__current_;
-+        __s.__node_ = this->first();
-+        break;
-+    }
-+  }
-+  else
-+  {
-+    __s.__do_ = __state::__reject;
-+    __s.__node_ = nullptr;
-+  }
-+}
-+#endif
-+
- using namespace std;
- 
- namespace build2

diff --git 
a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 
b/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
deleted file mode 100644
index c3717856b6b7..000000000000
--- a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx
      2020-07-10 20:12:57.000000000 +1000
-+++ 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx
   2020-07-14 14:33:58.939950579 +1000
-@@ -323,8 +323,6 @@
- 
- #ifndef _WIN32
-     static const dir_path usr_inc     ("/usr/include");
--    static const dir_path usr_loc_lib ("/usr/local/lib");
--    static const dir_path usr_loc_inc ("/usr/local/include");
- #  ifdef __APPLE__
-     static const dir_path a_usr_inc (
-       "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
-@@ -486,7 +484,6 @@
-         auto& ls (lib_dirs.first);
- 
-         bool ui  (find (is.begin (), is.end (), usr_inc)     != is.end ());
--        bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
- 
- #ifdef __APPLE__
-         // On Mac OS starting from 10.14 there is no longer /usr/include.
-@@ -509,7 +506,7 @@
-         //
-         // Is Apple's /usr/include.
-         //
--        if (!ui && !uli)
-+        if (!ui)
-         {
-           for (const dir_path& d: is)
-           {
-@@ -521,22 +518,16 @@
-           }
-         }
- #endif
--        if (ui || uli)
-+        if (ui)
-         {
--          bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
--
-           // Many platforms don't search in /usr/local/lib by default (but do
-           // for headers in /usr/local/include). So add it as the last option.
-           //
--          if (!ull && exists (usr_loc_lib, true /* ignore_error */))
--            ls.push_back (usr_loc_lib);
- 
-           // FreeBSD is at least consistent: it searches in neither. Quoting
-           // its wiki: "FreeBSD can't even find libraries that it installed."
-           // So let's help it a bit.
-           //
--          if (!uli && exists (usr_loc_inc, true /* ignore_error */))
--            is.push_back (usr_loc_inc);
-         }
-       }
- #endif

diff --git a/dev-util/build2/files/build2-0.14.0-update-for-install.patch 
b/dev-util/build2/files/build2-0.14.0-update-for-install.patch
deleted file mode 100644
index 28467f67dc24..000000000000
--- a/dev-util/build2/files/build2-0.14.0-update-for-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build2-toolchain-0.14.0-orig/buildfile     2021-10-19 20:44:33.000000000 
+1100
-+++ build2-toolchain-0.14.0/buildfile  2022-03-26 20:47:10.191006537 +1100
-@@ -6,9 +6,6 @@
- #       installation instructions in the BOOTSTRAP-* file corresponding to
- #       your platform/compiler.
- #
--assert ($build.meta_operation == 'dist'      || \
--        $build.meta_operation == 'configure' || \
--        $build.meta_operation == 'disfigure') 'only dist and configure 
supported'
- 
- # Package repository URL (or path).
- #

diff --git a/dev-util/build2/metadata.xml b/dev-util/build2/metadata.xml
deleted file mode 100644
index 9ebc6959458d..000000000000
--- a/dev-util/build2/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <!-- maintainer-needed -->
-       <longdescription lang="en">
-               build2 is an open source (MIT), cross-platform build toolchain
-               for developing and packaging C and C++ code. It is a hierarchy
-               of tools that includes the build system, package dependency
-               manager (for package consumption), and project dependency
-               manager (for project development). Key features:
-
-               Next-generation, Cargo-like integrated build toolchain for C
-               and C++.
-
-               Covers entire project lifecycle: creation, development,
-               testing, and delivery.
-
-               Uniform and consistent interface across all platforms and
-               compilers.
-
-               Fast, multi-threaded build system with parallel building and
-               testing.
-
-               Archive and version control-based package repositories.
-
-               Dependency-free, all you need is a C++ compiler.
-       </longdescription>
-       <upstream>
-               <remote-id type="github">build2/build2</remote-id>
-       </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 2d217422e927..e75a92a27397 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -804,7 +804,6 @@ kde-misc/bismuth
 # Removal on 2024-03-15.  Bug #924587.
 dev-cpp/libodb
 dev-cpp/libodb-sqlite
-dev-util/build2
 
 # Ulrich Müller <u...@gentoo.org> (2024-02-08)
 # Masked for testing.

Reply via email to