gentoo resync : 06.04.2022

4 files changed, 164 insertions, 4 deletions

diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
index 01a53e34684a..64d30a2115ac 100644
--- a/dev-cpp/libodb-sqlite/Manifest
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -1,5 +1,9 @@
+AUX build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch 912 BLAKE2B e3e90530c8593be5a6853542299081d795c0ae1719d68fb9c68e1bb7007aa6e43c7311721be5fb7886c5e67f3151a4fa0dbb244a6ee1916f17d6f29f5ce7990c SHA512 262feeffe5cbe9dade81d903c4d07bd1526f7942e42febdf84017d8190d4abcae0e39a8a1799db63018cb62dab0cb9c94f1a8de330aef96549a242f6da54a4cf
 AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
 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 libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0 SHA512 be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
-EBUILD libodb-sqlite-2.5.0_beta19.ebuild 2944 BLAKE2B 5e06df184bd2b51956fb050e88fa602f6dcccb393fd833f24776d03c5e544214bdea9b633e7731786e7b4e1cdf6d4ffbd74af02b415fb6dfc47ca62203b0f443 SHA512 7a7ef9fe5545fdf0d575226cd7185ccf8539d6773944400655cf410e7d00bc6f2150e748fb869d47f4cb22c94b17efabfaea086cb9f55365d710a1ab9caa78d6
+DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce SHA512 a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
+EBUILD libodb-sqlite-2.5.0_beta19.ebuild 3047 BLAKE2B d8f3ad6f4a660578ef18be3f424070fc0b76506deacf615fd0fb3a6bf06bf53a506b0a61193dbe1b21d8fd72add63ea131b1bd78e04bb9eeb500817622aed443 SHA512 c9dadbb3dbc3fa009ac4fc6b9779955011acdfca6792bf8d853cd789ca6d1aa25f813e52a4a11138d734f24e694b51055996c77397efd7b7a24ae878306a9909
+EBUILD libodb-sqlite-2.5.0_beta21.ebuild 2944 BLAKE2B 3f1b342dcbd02217e0433c2a957d4219636a9e2e47f805aaf902db6c6bf43941641a6ce1a034356ae22681755881af1501df7448950a442d33725fa83a4806d5 SHA512 3e5a3b7dc5b12e254f0faf216c00a049bf192e996943f4cdabfa2adcbc24a3230a37214f89608328e83a4b5194272efb68ef9dc3c13833874f4736b8678a429d
 MISC metadata.xml 910 BLAKE2B 7063501aac969fa79938ca8d91e000811d48b00d14424a48cf57a4ba46e74c1100cae9c0c4fc7e2707ea4bf1e2e21e9f1eca254dbb665d7931b606ead8281cda SHA512 20edccf9e1907a0b154ab8c517b9b440a65206664432a725a764288822fb56dcdbd1fb04ad20b138d488e53164adde2296af799859871663c03acefe6d9f4d80
diff --git a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index 000000000000..00b685600c8e
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- 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-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
index a8f86d0c81e3..667455d569ee 100644
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ src_prepare() {
 
 	cd "${BS}" || die
 	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	eapply "${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 	sed \
 		-e 's:libsqlite3[/]\?::' \
 		-i buildfile build/bootstrap.build \
@@ -97,7 +98,6 @@ src_configure() {
 		config.bin.ar="$(tc-getAR)" \
 		config.bin.ranlib="$(tc-getRANLIB)" \
 		config.bin.lib=shared \
-		config.install.chroot="${D}" \
 		config.install.root="${EPREFIX}"/usr \
 		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
 		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -113,5 +113,6 @@ src_test() {
 }
 
 src_install() {
-	b install
+	b install \
+		config.install.chroot="${D}"
 }
diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
new file mode 100644
index 000000000000..996133e1f47f
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+	https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-cpp/libodb
+	dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	!<dev-util/build2-0.14.0
+"
+
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+b() {
+	local myargs=(
+		--jobs $(makeopts_jobs)
+		--verbose 3
+	)
+	export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+	set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+	echo "${@}"
+	"${@}" || die "${@} failed"
+}
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	for i in ${BUILD2_P}/libodb-sqlite/buildfile ${MY_P}/buildfile; do
+		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+			"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+			"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+			${i} \
+			|| die
+	done
+
+	cd "${BS}" || die
+	eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+	sed \
+		-e 's:libsqlite3[/]\?::' \
+		-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
+
+	cd "${S}" || die
+	default
+}
+
+src_configure() {
+	pushd ${BS} || die
+	emake -C build2 -f bootstrap.gmake \
+		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+	popd || die
+
+	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}"
+}