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

["Joonas Niilola" <juippis@gentoo.org>]

commit:     3a9f0f0469c034feec20c0dd1827f725895f9727
Author:     Pierre-Nicolas Clauss <pinicarus <AT> protonmail <DOT> com>
AuthorDate: Sun Jul 11 10:29:39 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 10:25:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9f0f04

dev-util/tup: upgrade to 0.7.10

Build of 0.7.8 fails since `fuse` pkgconfig is now called `fuse3`.

- restrict fuse dependency slot
- make sed replacements more resilient
- move selection of system sqlite to the prepare phase
- remove tests failing in sandbox

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Pierre-Nicolas Clauss <pinicarus <AT> protonmail.com>
Closes: https://bugs.gentoo.org/704990
Closes: https://github.com/gentoo/gentoo/pull/21623
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/tup/Manifest          |   1 +
 dev-util/tup/tup-0.7.10.ebuild | 102 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index 5824be2f57f..63bcf2f318d 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1 +1,2 @@
+DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5

diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild
new file mode 100644
index 00000000000..7dd82f37839
--- /dev/null
+++ b/dev-util/tup/tup-0.7.10.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A file-based build system"
+HOMEPAGE="http://gittup.org/tup"
+# Tup itself is GPLv2, but it bundles differently licensed software:
+# - lua: MIT
+# - sqlite (unused in this ebuild): public domain
+# - inih: 3-clause BSD
+# - red-black tree implementation: 2-clause BSD
+# - queue implementation: 3-clause BSD
+LICENSE="GPL-2 MIT public-domain BSD BSD-2"
+SLOT="0"
+
+if [[ "${PV}" == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gittup/tup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	dev-db/sqlite:=
+	dev-libs/libpcre:=
+	sys-fs/fuse:3=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
+WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
+WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
+
+src_prepare() {
+	# Use our toolchain
+	sed -i Tuprules.tup \
+		-e "s|CC = gcc|CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}|" \
+		-e "s|ar crs|$(tc-getAR) crs|" || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# Avoid invoking `git` to find version, use ours
+		sed -i src/tup/link.sh \
+			-e 's|`git describe`|v'"${PV}|" || die
+	fi
+
+	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
+
+	default
+}
+
+src_compile() {
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+	./bootstrap-nofuse.sh || die
+	unset TUP_NO_NAMESPACING
+}
+
+src_install() {
+	dobin tup
+	dolib.a libtup_client.a
+	doheader tup_client.h
+	doman tup.1
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
+	# tup uses fuse when tracking dependencies.
+	addwrite /dev/fuse
+
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+
+	# Skip tests which require namespacing or root privileges.
+	pushd test || die
+	rm -v ./*full-deps*.sh \
+	      t2150-lua-tupdefault.sh \
+	      t2172-lua-relativedir.sh \
+	      t2187-tupdefault.sh \
+	      t2197-tupdefault-ghost.sh \
+	      t4069-gcc-coverage.sh \
+	      t4072-proc-self.sh \
+	      t4074-getpwd.sh \
+	      t4131-proc-self-exe.sh \
+	      t4132-proc-meminfo.sh \
+	      t4171-dev-null.sh \
+	      t4200-ccache.sh \
+	      t4201-ccache2.sh \
+	      t4202-clang.sh \
+	      t5083-symlink-fullpath.sh \
+	      t5084-symlink-fullpath2.sh \
+	      t5103-python-sh.sh || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}