gentoo resync : 24.07.2021

2 files changed, 104 insertions, 0 deletions

diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index ed9e7db3f42b..84e9cc8584ef 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,4 +1,6 @@
+DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
+EBUILD tup-0.7.10.ebuild 2663 BLAKE2B ba8ade6dc91e53ba36c7d15d00b943fa27408d50df38590ec76f3cdfcc020db8a0e1e111a4292aec3649c82bd7732fe7ada9676b656ddc3e70196138e34c868c SHA512 e8c6fe14791d25fee951d4b21740a8a4523e2eee083fe182d99c7089876397861a6bd343b4951743ca946755d9a2e0122777de0f6273c12feba6f299f438e72c
 EBUILD tup-0.7.8.ebuild 2430 BLAKE2B 4957aa1a9f0a98ba486ecee3785a38b3676f5f8aec55ba7d202559ca19ed77d556d01f433eb9b27ac75a9c44cf2bce4724720a9647ea10fe634a4c48d1a5d06e SHA512 19e0df9bc0287d7c9fe5611f7532aa7839af5ff204dd4c32c6aa2e997c31cf5579dd00407ac0ae3821c647ec61400e0cc7d3e689597ab93ce339bd9169abfb76
 EBUILD tup-9999.ebuild 2447 BLAKE2B 3e33c0e837b8469e1906b63c96ef7a6944ff29b9c16c0e5c519b1555b044c4155ec7d787443143a2d54a1ce7356808c280294aae5211ab6ec17b18cf67325d7f SHA512 fcd9a127f316d2eb520ed14c9f8cf5da3458058f58c2dd6715fd4aa90c28c002b9cfa9a905e255f78b96b9695caf26b5d73b2185f28c162ede7fdceca9fe1f38
 MISC metadata.xml 242 BLAKE2B 1e34d8d82a789942bfacaa7957c074695a55b4363e2982752b4dd2c8242ad50ccaa6537bfc584a31cdf360bfb31849a39422997924ad2dac438ddbf7e25798e7 SHA512 a487da6c7fc5c14c9cbaceb95c356ceb039824f29855537f8ff45c09b2973087140481fa052603d0e8c1a7244de43bf05727c6e9fca06963f5f3e3d3e8ecf0d4
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 000000000000..7dd82f378397
--- /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
+}