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

["Mark Wright" <gienah@gentoo.org>]

commit:     cce662903d44519fd37ad43e7fc51e9dcb46780f
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 03:08:30 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 03:08:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce66290

dev-util/build2: Use || die, formatting

Correct the build2/build2/buildfile build2/libbuild2/buildfile paths.

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

 .../build2-0.13.0_alpha0_pre20200718101251.ebuild  | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
index 20a81aeca39..72226d3f5bc 100644
--- a/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
+++ b/dev-util/build2/build2-0.13.0_alpha0_pre20200718101251.ebuild
@@ -43,21 +43,27 @@ b() {
 
 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
+		"-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
+		-i buildfile build/bootstrap.build \
+		|| die
 
 	if has_version dev-util/pkgconf; then
-		for i in build2/buildfile libbuild2/buildfile; do
+		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}"
+				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+				"${i}" \
+				|| die
 		done
 		sed \
 			-e 's:libpkgconf[/]\?::' \
-			-i buildfile build/bootstrap.build
+			-i buildfile build/bootstrap.build \
+			|| die
 	fi
 
 	default
@@ -65,9 +71,9 @@ src_prepare() {
 
 src_configure() {
 	emake -C build2 -f bootstrap.gmake \
-		  CXX=$(tc-getCXX) \
-		  CXXFLAGS="${CXXFLAGS}" \
-		  LDFLAGS="${LDFLAGS}"
+		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 
 	b configure \
 		config.cxx="$(tc-getCXX)" \
@@ -96,6 +102,6 @@ src_test() {
 
 src_install() {
 	b install
-	mkdir -p "${ED}"/usr/share/doc/${PF}/html
+	mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
 	mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html
 }