[gentoo-commits] repo/gentoo:master commit in: dev-util/build2/, dev-util/build2/files/

[Mark Wright]

commit:     2e83b5676703ca96a2b15eb5ff65695d26fed92e
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 00:58:41 2022 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 00:59:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e83b567

dev-util/build2: Bump to 0.14.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-util/build2/Manifest                           |   1 +
 dev-util/build2/build2-0.14.0.ebuild               | 144 +++++++++++++++++++++
 .../files/build2-0.14.0-update-for-install.patch   |  12 ++
 3 files changed, 157 insertions(+)

diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
index b147c4c33705..6b2a52834c2d 100644
--- a/dev-util/build2/Manifest
+++ b/dev-util/build2/Manifest
@@ -1 +1,2 @@
 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

diff --git a/dev-util/build2/build2-0.14.0.ebuild b/dev-util/build2/build2-0.14.0.ebuild
new file mode 100644
index 000000000000..7382fef53347
--- /dev/null
+++ b/dev-util/build2/build2-0.14.0.ebuild
@@ -0,0 +1,144 @@
+# 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/files/build2-0.14.0-update-for-install.patch b/dev-util/build2/files/build2-0.14.0-update-for-install.patch
new file mode 100644
index 000000000000..28467f67dc24
--- /dev/null
+++ b/dev-util/build2/files/build2-0.14.0-update-for-install.patch
@@ -0,0 +1,12 @@
+--- 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).
+ #