gentoo resync : 20.03.2022

2 files changed, 119 insertions, 0 deletions

diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index e7a3304ab5b8..26a5701f440b 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,6 +1,8 @@
 DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
+DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
 EBUILD tup-0.7.10.ebuild 2662 BLAKE2B f50b00cc784dfaa0ccf2bdd072e648709f78faab37e6ed77bdf5c717c497719edc3f906d8ae02ba49af9e5f09db1b7931f0208dd47d2d85815ca22feca9d8134 SHA512 68b6e49051945d9337998844020ce6f39fb236e1754bd755704163a29666fe779477db39c3d80a3fe9b87235838207556776d3e9be8369db57feb1be3ac83ac5
+EBUILD tup-0.7.11.ebuild 3035 BLAKE2B f3fb01fd267a3212481c595b8458eec1c65ae29470889b9d9e7c8b01c5d5d13214b180c6fe84052b90f4938986a06f0a68758737f1c80914277a8ac26cf70943 SHA512 e162dabd731600172d8bc5ebe33f1b8e7fb073115a0bf877feadb3ce592c101bc9e53662083998d14b877044021334d5b19703ea8f93959a32e13bc6683189f2
 EBUILD tup-0.7.8.ebuild 2430 BLAKE2B 4957aa1a9f0a98ba486ecee3785a38b3676f5f8aec55ba7d202559ca19ed77d556d01f433eb9b27ac75a9c44cf2bce4724720a9647ea10fe634a4c48d1a5d06e SHA512 19e0df9bc0287d7c9fe5611f7532aa7839af5ff204dd4c32c6aa2e997c31cf5579dd00407ac0ae3821c647ec61400e0cc7d3e689597ab93ce339bd9169abfb76
 EBUILD tup-9999.ebuild 2447 BLAKE2B 3e33c0e837b8469e1906b63c96ef7a6944ff29b9c16c0e5c519b1555b044c4155ec7d787443143a2d54a1ce7356808c280294aae5211ab6ec17b18cf67325d7f SHA512 fcd9a127f316d2eb520ed14c9f8cf5da3458058f58c2dd6715fd4aa90c28c002b9cfa9a905e255f78b96b9695caf26b5d73b2185f28c162ede7fdceca9fe1f38
 MISC metadata.xml 243 BLAKE2B b87b031fb5a945f70afbd431c56a3290c4cb0926e55d9a7bb10040806d40d494688e7c532131e6b47d9fc79237c08b41ea60fb14eb0e84b295788a5cb7b69bb5 SHA512 7f3a04c70b392b12fe3efb4c2fc0d75f7e9dd1e3b74568862913c678843e52883584bc892e8059b21c94bb515831923259a086f99481adb02cee02d852ae34ed
diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild
new file mode 100644
index 000000000000..d6acd475e038
--- /dev/null
+++ b/dev-util/tup/tup-0.7.11.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 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="https://gittup.org/tup https://github.com/gittup/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}"
+BDEPEND="virtual/pkgconfig"
+
+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 t2150-lua-tupdefault.sh \
+		t2172-lua-relativedir.sh \
+		t2187-tupdefault.sh \
+		t2197-tupdefault-ghost.sh \
+		t2220-lua-open-external.sh \
+		t4062-full-deps.sh \
+		t4063-full-deps2.sh \
+		t4064-full-deps3.sh \
+		t4065-full-deps-proc.sh \
+		t4067-full-deps5.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 \
+		t4205-full-deps6.sh \
+		t4206-full-deps7.sh \
+		t4207-full-deps8.sh \
+		t4208-full-deps-external.sh \
+		t4209-full-deps-external2.sh \
+		t4210-full-deps-getaddrinfo.sh \
+		t4215-full-deps-get-nprocs.sh \
+		t5083-symlink-fullpath.sh \
+		t5084-symlink-fullpath2.sh \
+		t5103-python-sh.sh \
+		t7048-full-deps.sh \
+		t8105-variant-parse-progress.sh || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}