gentoo auto-resync : 20:12:2023 - 07:52:53

2 files changed, 145 insertions, 0 deletions

diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
index 7e6c62be6d49..72a37ae23b62 100644
--- a/dev-util/build2/Manifest
+++ b/dev-util/build2/Manifest
@@ -3,6 +3,8 @@ AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501c
 AUX build2-0.14.0-update-for-install.patch 508 BLAKE2B 71de52e22fe72ced3368fec8badaa82bd3665706142ba99b602bb5a18203f858b0d8ff4a27cf7041deb5a11f16f544006af04583188ca587a0e8c6b5ffea1851 SHA512 a4fc266ee6904a92bacb83080d19a71f178fb92e38957fe29fe35220f64d1bac5a78306d35b0dfa7086580de597c601a1679f03375590ce76b4fcb52aa435ac9
 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
 EBUILD build2-0.13.0.ebuild 3396 BLAKE2B 2d16b9376910721e4af95c6166e535f059312c7abab5d66e43a2db22288039b3fe346409e5aa7ebbd06a062c7573da88406ac054ae049bb6829f54fdb4f04637 SHA512 9eddaf2a6ba49bc24039b1c2ecae8141f49653418357a8b968bd0baa29d21704b6a73b92028e7dc9a62ab907d4c235f8ac316a73d5d6dbca7439ef9e96c252dc
 EBUILD build2-0.14.0.ebuild 4141 BLAKE2B 068e3004941fcff986a2bfa41c23c572cce402ffb4b9d450f94a852089f01f93095dbf3dfb717b8b4f0fe278ae625d356173b8efd0f348f6ef81407096bb04f7 SHA512 5a446d755e7a8cb572246d94a8472151d5e239ba4a8a153f55eb9b99a1c91dfc2c562c4be99cb7cdd781d28e24d9f7a2238584cf263d6679fe616c9e227ce1ce
+EBUILD build2-0.16.0.ebuild 4129 BLAKE2B e5a6353ae7cadf74d5ea04bc77aa366068781603116d5a60990c8ec9d432342bcaa85686d47275624a2878d9078df9765ad4b0b9244b66ee5e3c7cc8b4787302 SHA512 43623d2fd28624baf60427bb04b00cf3f97d07c22f8d4f30a34a1bf4b200c43a8a232ff6d8d29bd1c028f9d5df5812b08a472f53e201ff0d7600cf8a56eda56b
 MISC metadata.xml 1094 BLAKE2B 19ebcbb7dddf61a1be4c003e45e6b177aca720ed5e416e5402db5c88b8cbd66edfa12661c099b7cf4aa931ef52211413eea1861aba321b910cc4b1a3426d47ec SHA512 462583a9494a117e1115895730135f9349750befadeb14bf1d5f00794a249fb6ee3b335710159f84c7d1cd26bfc28aaa0759514a015d8668c0e0e5853064c153
diff --git a/dev-util/build2/build2-0.16.0.ebuild b/dev-util/build2/build2-0.16.0.ebuild
new file mode 100644
index 000000000000..e823b9f35655
--- /dev/null
+++ b/dev-util/build2/build2-0.16.0.ebuild
@@ -0,0 +1,143 @@
+# 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
+}