* [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, dev-build/tup/, profiles/
@ 2024-02-24 12:53 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2024-02-24 12:53 UTC (permalink / raw
To: gentoo-commits
commit: 2438a76e38b8268a907bf809af562bc6d15203a9
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 12:43:45 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 12:43:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2438a76e
dev-build/tup: treeclean
Closes: https://bugs.gentoo.org/803035
Closes: https://bugs.gentoo.org/833130
Closes: https://bugs.gentoo.org/711856
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-build/tup/Manifest | 2 -
dev-build/tup/metadata.xml | 8 ---
dev-build/tup/tup-0.7.10.ebuild | 102 -----------------------------------
dev-build/tup/tup-0.7.11.ebuild | 117 ----------------------------------------
dev-build/tup/tup-9999.ebuild | 101 ----------------------------------
profiles/package.mask | 1 -
profiles/updates/1Q-2024 | 1 -
7 files changed, 332 deletions(-)
diff --git a/dev-build/tup/Manifest b/dev-build/tup/Manifest
deleted file mode 100644
index 0b092374b310..000000000000
--- a/dev-build/tup/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f896bbbb65983e80f8b5c24
-DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee
diff --git a/dev-build/tup/metadata.xml b/dev-build/tup/metadata.xml
deleted file mode 100644
index 1648a2ba9c49..000000000000
--- a/dev-build/tup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">gittup/tup</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-build/tup/tup-0.7.10.ebuild b/dev-build/tup/tup-0.7.10.ebuild
deleted file mode 100644
index 536d341d02b8..000000000000
--- a/dev-build/tup/tup-0.7.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="File-based build system"
-HOMEPAGE="https://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
-}
diff --git a/dev-build/tup/tup-0.7.11.ebuild b/dev-build/tup/tup-0.7.11.ebuild
deleted file mode 100644
index 773da29d997b..000000000000
--- a/dev-build/tup/tup-0.7.11.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="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
-}
diff --git a/dev-build/tup/tup-9999.ebuild b/dev-build/tup/tup-9999.ebuild
deleted file mode 100644
index e750b58f90de..000000000000
--- a/dev-build/tup/tup-9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="File-based build system"
-HOMEPAGE="https://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:=
-"
-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:"
-
- if [[ ${PV} != 9999 ]]; then
- # Avoid invoking `git` to find version, use ours
- sed -i src/tup/link.sh \
- -e 's;`git describe`;v'"${PV};"
- fi
-
- default
-}
-
-src_configure() {
- echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
-}
-
-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
- SKIPPED_TESTS=(
- t4069-gcc-coverage.sh
- t4072-proc-self.sh
- t4074-getpwd.sh
- t4131-proc-self-exe.sh
- t4132-proc-meminfo.sh
- t4171-dev-null.sh
- t4202-clang.sh
- t4200-ccache.sh
- t5083-symlink-fullpath.sh
- t5084-symlink-fullpath2.sh
- )
- rm ${SKIPPED_TESTS[@]} || die
- ./test.sh || die
- popd || die
-
- unset TUP_NO_NAMESPACING
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 9d59db4ec580..d375117ad571 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -220,7 +220,6 @@ sci-visualization/tensorboard
# dev-build/tup was last released in 2021 and has a few bugs reported.
# Removal on 2024-02-16. Bug #922329.
dev-build/cons
-dev-build/tup
# Andreas Sturmlechner <asturm@gentoo.org> (2023-12-25)
# Masked until KF6 is unmasked.
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index c36a364ac157..b13a964250b3 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -44,7 +44,6 @@ move dev-util/bazel dev-build/bazel
move dev-util/gn dev-build/gn
move dev-util/gyp dev-build/gyp
move dev-util/netsurf-buildsystem dev-build/netsurf-buildsystem
-move dev-util/tup dev-build/tup
move sys-devel/cons dev-build/cons
move dev-util/scons dev-build/scons
move sys-devel/qconf dev-build/qconf
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-24 12:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-24 12:53 [gentoo-commits] repo/gentoo:master commit in: profiles/updates/, dev-build/tup/, profiles/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox