[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 8cc0af427ee521dd798e7b86d656d5db5957ff02 Author: Joonas Niilola gentoo org> AuthorDate: Sun Jan 8 07:43:15 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jan 8 07:43:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc0af42 dev-util/tup: Stabilize 0.7.11 amd64, #886723 Signed-off-by: Joonas Niilola gentoo.org> dev-util/tup/tup-0.7.11.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild index 18992088eedc..42faf664fa7d 100644 --- a/dev-util/tup/tup-0.7.11.ebuild +++ b/dev-util/tup/tup-0.7.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ if [[ "${PV}" == ]]; then inherit git-r3 else SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 8196b6a60f2fd0b60e97a42941d5a893b6f89181 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jun 8 10:58:05 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Jul 2 17:35:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8196b6a6 dev-util/tup: use HTTPS, update DESCRIPTION Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/25807 Signed-off-by: Joonas Niilola gentoo.org> dev-util/tup/tup-0.7.10.ebuild | 6 +++--- dev-util/tup/tup-0.7.11.ebuild | 4 ++-- dev-util/tup/tup-.ebuild | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild index 5c53cf4cfbb1..46df5503aea3 100644 --- a/dev-util/tup/tup-0.7.10.ebuild +++ b/dev-util/tup/tup-0.7.10.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# 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="http://gittup.org/tup; +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 diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild index d6acd475e038..18992088eedc 100644 --- a/dev-util/tup/tup-0.7.11.ebuild +++ b/dev-util/tup/tup-0.7.11.ebuild @@ -5,8 +5,8 @@ EAPI=7 inherit linux-info toolchain-funcs -DESCRIPTION="A file-based build system" -HOMEPAGE="https://gittup.org/tup https://github.com/gittup/tup; +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 diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index e657af1652d7..d09d50bfbccb 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# 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="http://gittup.org/tup; +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
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 8311d1c0e5d65ac95b9615cf126e25fc03de9053 Author: Sam James gentoo org> AuthorDate: Sun Apr 17 18:55:29 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 17 19:00:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8311d1c0 dev-util/tup: drop 0.7.8 Signed-off-by: Sam James gentoo.org> dev-util/tup/Manifest | 1 - dev-util/tup/tup-0.7.8.ebuild | 100 -- 2 files changed, 101 deletions(-) diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest index d96de485f711..0b092374b310 100644 --- a/dev-util/tup/Manifest +++ b/dev-util/tup/Manifest @@ -1,3 +1,2 @@ DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f89665983e80f8b5c24 DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee -DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5 diff --git a/dev-util/tup/tup-0.7.8.ebuild b/dev-util/tup/tup-0.7.8.ebuild deleted file mode 100644 index 196b8edbc201.. --- a/dev-util/tup/tup-0.7.8.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 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}" == ]]; 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} != ]]; 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//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//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 - t4200-ccache.sh - t5083-symlink-fullpath.sh - t5084-symlink-fullpath2.sh - ) - rm ${SKIPPED_TESTS[@]} || die - ./test.sh || die - popd || die - - unset TUP_NO_NAMESPACING -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: ad203f6a5b91b8fdb98f91a472a567402c071af3 Author: Pierre-Nicolas Clauss protonmail com> AuthorDate: Wed Jan 12 23:45:01 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Feb 11 14:56:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad203f6a dev-util/tup: upgrade to 0.7.11 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Pierre-Nicolas Clauss protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23782 Signed-off-by: Joonas Niilola gentoo.org> dev-util/tup/Manifest | 1 + dev-util/tup/tup-0.7.11.ebuild | 116 + 2 files changed, 117 insertions(+) diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest index 63bcf2f318d0..d96de485f711 100644 --- a/dev-util/tup/Manifest +++ b/dev-util/tup/Manifest @@ -1,2 +1,3 @@ DIST tup-0.7.10.tar.gz 4651047 BLAKE2B 067730f8fa202dfff7fbf566fef609038839a47ddb9f9029155b4eee428eae9fd088bab1c5373155de0b445700cc8b7cbe0c40dd3d9665504c9e37de24b01ed4 SHA512 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f89665983e80f8b5c24 +DIST tup-0.7.11.tar.gz 4683309 BLAKE2B 2914339499e80cf52318aaf9d682ac482f17c2acf6eeebb2dac84776cd4407fc23fbb1c61e5e7634ce6f18563e24ff524b284cbe8b46306f82870fdb32166efb SHA512 b923366bb15ce6e5be027b6b3e98b1029cd7dbe6ce2a8dd37a8e4b71521c8ff6d95d88fe296f5ca4719bbc048c6aaa5eacdd8cac1410d46df54ac674d6fd8aee DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5 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 ..74a30dda33e3 --- /dev/null +++ b/dev-util/tup/tup-0.7.11.ebuild @@ -0,0 +1,116 @@ +# 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="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}" == ]]; 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} != ]]; 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//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//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 \ +
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 9370b547c812cb75491dfda2ca881aeb296e568c Author: Joonas Niilola gentoo org> AuthorDate: Fri Feb 11 14:08:40 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Feb 11 14:56:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9370b547 dev-util/tup: update HOMEPAGE, add missing BDEPEND for 0.7.11 Signed-off-by: Joonas Niilola gentoo.org> dev-util/tup/tup-0.7.11.ebuild | 69 +- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/dev-util/tup/tup-0.7.11.ebuild b/dev-util/tup/tup-0.7.11.ebuild index 74a30dda33e3..d6acd475e038 100644 --- a/dev-util/tup/tup-0.7.11.ebuild +++ b/dev-util/tup/tup-0.7.11.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit linux-info toolchain-funcs DESCRIPTION="A file-based build system" -HOMEPAGE="http://gittup.org/tup; +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 @@ -25,11 +25,12 @@ else fi DEPEND=" - dev-db/sqlite:= - dev-libs/libpcre:= - sys-fs/fuse:3= + 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" @@ -79,36 +80,36 @@ src_test() { # 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 + 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
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 1aaf35c6a9c366322812f3065f7f808e7cee4e9f Author: Jakov Smolić gentoo org> AuthorDate: Sun Dec 5 07:49:17 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Dec 5 07:49:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aaf35c6 dev-util/tup: Stabilize 0.7.10 amd64, #828296 Signed-off-by: Jakov Smolić gentoo.org> dev-util/tup/tup-0.7.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/tup/tup-0.7.10.ebuild b/dev-util/tup/tup-0.7.10.ebuild index 7dd82f378397..5c53cf4cfbb1 100644 --- a/dev-util/tup/tup-0.7.10.ebuild +++ b/dev-util/tup/tup-0.7.10.ebuild @@ -21,7 +21,7 @@ if [[ "${PV}" == ]]; then inherit git-r3 else SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 3a9f0f0469c034feec20c0dd1827f725895f9727 Author: Pierre-Nicolas Clauss protonmail com> AuthorDate: Sun Jul 11 10:29:39 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jul 20 10:25:18 2021 + 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 protonmail.com> Closes: https://bugs.gentoo.org/704990 Closes: https://github.com/gentoo/gentoo/pull/21623 Signed-off-by: Joonas Niilola 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 65009e57be2ae85187779f5b9317f2850b007bfbfef92c7191648ba4e927a5709a0d48e8a1ad8b8480e7340568f4b207e8d0e8874f89665983e80f8b5c24 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 000..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}" == ]]; 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} != ]]; 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//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//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 +
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: a6b83edd3a7a5d85e0bf43266cc37faf2bbade4b Author: Andrey Utkin gentoo org> AuthorDate: Mon Jul 27 22:23:47 2020 + Commit: Andrey Utkin gentoo org> CommitDate: Mon Jul 27 23:47:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b83edd dev-util/tup: drop to maintainer-needed Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-util/tup/metadata.xml b/dev-util/tup/metadata.xml index 390ab1cc501..c16fe2d5fe2 100644 --- a/dev-util/tup/metadata.xml +++ b/dev-util/tup/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - andrey_ut...@gentoo.org - Andrey Utkin - + gittup/tup
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 10d6266e6daba0e38a42b1277447c7b820cb2ad5 Author: Andrey Utkin gentoo org> AuthorDate: Wed Jul 10 17:24:58 2019 + Commit: Andrey Utkin gentoo org> CommitDate: Wed Jul 10 17:37:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d6266e dev-util/tup: : update test exclusions A new test calls clang unconditionally. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/tup-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index 2662d05de6f..f195a3f6ef1 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -88,6 +88,7 @@ src_test() { 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
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 27637b60bff65066f0d0823aaddcdb78a65c2ca7 Author: Andrey Utkin gentoo org> AuthorDate: Mon Apr 8 18:20:18 2019 + Commit: Andrey Utkin gentoo org> CommitDate: Mon Apr 8 18:21:47 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27637b60 dev-util/tup: drop old version 0.7.7 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/Manifest | 1 - dev-util/tup/tup-0.7.7.ebuild | 103 -- 2 files changed, 104 deletions(-) diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest index c6e20f057ed..5824be2f57f 100644 --- a/dev-util/tup/Manifest +++ b/dev-util/tup/Manifest @@ -1,2 +1 @@ -DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5 diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild deleted file mode 100644 index 194cf670515..000 --- a/dev-util/tup/tup-0.7.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2018 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}" == ]]; 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:= - 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} != ]]; 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//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//setgroups - # which violates sandboxing. - export TUP_NO_NAMESPACING=1 - - # Skip tests which require namespacing or root privileges. - SKIPPED_TESTS=( - 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 - t5083-symlink-fullpath.sh - t5084-symlink-fullpath2.sh - t7048-full-deps.sh - ) - pushd test || die - rm ${SKIPPED_TESTS[@]} || die - ./test.sh || die - popd || die - - unset TUP_NO_NAMESPACING -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 84f802ecf7395cd67d900334d39749a9589af67e Author: Mikle Kolyada gentoo org> AuthorDate: Fri Feb 8 13:58:08 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Feb 8 13:59:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f802ec dev-util/tup: amd64 stable wrt bug #677118 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-util/tup/tup-0.7.8.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/tup/tup-0.7.8.ebuild b/dev-util/tup/tup-0.7.8.ebuild index 2662d05de6f..5799fa9056d 100644 --- a/dev-util/tup/tup-0.7.8.ebuild +++ b/dev-util/tup/tup-0.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ if [[ "${PV}" == ]]; then inherit git-r3 else SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 6e62ad648edfb9671bbcd7421031bd32e9da7c43 Author: Andrey Utkin gentoo org> AuthorDate: Sun Dec 2 03:18:28 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Dec 2 03:19:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e62ad64 dev-util/tup: add new version 0.7.8 Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/Manifest | 1 + dev-util/tup/tup-0.7.8.ebuild | 100 ++ 2 files changed, 101 insertions(+) diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest index d9c8a9d735d..c6e20f057ed 100644 --- a/dev-util/tup/Manifest +++ b/dev-util/tup/Manifest @@ -1 +1,2 @@ DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad +DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5 diff --git a/dev-util/tup/tup-0.7.8.ebuild b/dev-util/tup/tup-0.7.8.ebuild new file mode 100644 index 000..2662d05de6f --- /dev/null +++ b/dev-util/tup/tup-0.7.8.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2018 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}" == ]]; 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} != ]]; 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//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//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 + t4200-ccache.sh + t5083-symlink-fullpath.sh + t5084-symlink-fullpath2.sh + ) + rm ${SKIPPED_TESTS[@]} || die + ./test.sh || die + popd || die + + unset TUP_NO_NAMESPACING +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: e34357e26c70f445f6964904e7d2bb9c7f54f048 Author: Andrey Utkin gentoo org> AuthorDate: Sun Dec 2 03:03:02 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Dec 2 03:19:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34357e2 dev-util/tup: : test: update exclusions Make current git master pass test phase. A bunch of new "full-deps" tests, which require a feature restricted in sandbox, has been added, and it became tedious to maintain their full explicit list, so now "full-deps" tests are excluded by name pattern. Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/tup-.ebuild | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index 194cf670515..0f0d0db5aa9 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -78,23 +78,19 @@ src_test() { export TUP_NO_NAMESPACING=1 # Skip tests which require namespacing or root privileges. + pushd test || die + rm -v ./*full-deps*.sh SKIPPED_TESTS=( - 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 t5083-symlink-fullpath.sh t5084-symlink-fullpath2.sh - t7048-full-deps.sh ) - pushd test || die rm ${SKIPPED_TESTS[@]} || die ./test.sh || die popd || die
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: fc71b73119e1ebfd0426af49705a937ee1b3c1f1 Author: Andrey Utkin gentoo org> AuthorDate: Sun Dec 2 03:16:51 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Dec 2 03:19:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc71b731 dev-util/tup: : add dep on dev-libs/libpcre Since upstream commit 9dcdb75201a8 ("Use pcre instead of sqlite for matching exclusions") tup depends on libpcre. Announced in 0.7.8 release notes. Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/tup-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index 0f0d0db5aa9..2662d05de6f 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -26,6 +26,7 @@ fi DEPEND=" dev-db/sqlite:= + dev-libs/libpcre:= sys-fs/fuse:= " RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 066dc8d64640f78bb7d93a0a489d61ce5b1efef9 Author: Andrey Utkin gentoo org> AuthorDate: Sun Dec 2 02:02:56 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Dec 2 02:46:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066dc8d6 dev-util/tup: fail src_test if no /dev/fuse It fails anyway (see bug 664768). Provide user with clear error message. No revbump for 0.7.7 as the change doesn't affect successful installations. Bug: https://bugs.gentoo.org/664768 Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/tup-0.7.7.ebuild | 1 + dev-util/tup/tup-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild index e248bb29dc6..194cf670515 100644 --- a/dev-util/tup/tup-0.7.7.ebuild +++ b/dev-util/tup/tup-0.7.7.ebuild @@ -69,6 +69,7 @@ src_install() { } src_test() { + [[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work" # tup uses fuse when tracking dependencies. addwrite /dev/fuse diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index e248bb29dc6..194cf670515 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -69,6 +69,7 @@ src_install() { } src_test() { + [[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work" # tup uses fuse when tracking dependencies. addwrite /dev/fuse
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 8753de7a2413c60609ca0b99616a8e19da29d4f6 Author: Andrey Utkin gentoo org> AuthorDate: Sun Dec 2 01:47:51 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Dec 2 02:46:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8753de7a dev-util/tup: warn if important kernel options are not enabled No revbump for 0.7.7 as the change doesn't affect successful installations. Bug: https://bugs.gentoo.org/664768 Package-Manager: Portage-2.3.49, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> dev-util/tup/tup-0.7.7.ebuild | 8 ++-- dev-util/tup/tup-.ebuild | 8 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild index 104dd83a9db..e248bb29dc6 100644 --- a/dev-util/tup/tup-0.7.7.ebuild +++ b/dev-util/tup/tup-0.7.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit linux-info toolchain-funcs DESCRIPTION="A file-based build system" HOMEPAGE="http://gittup.org/tup; @@ -30,6 +30,10 @@ DEPEND=" " 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 \ diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild index 104dd83a9db..e248bb29dc6 100644 --- a/dev-util/tup/tup-.ebuild +++ b/dev-util/tup/tup-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit linux-info toolchain-funcs DESCRIPTION="A file-based build system" HOMEPAGE="http://gittup.org/tup; @@ -30,6 +30,10 @@ DEPEND=" " 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 \
[gentoo-commits] repo/gentoo:master commit in: dev-util/tup/
commit: 87056724896f44e4d1843e0e8d17806bdecf11a5 Author: Andrey Utkin gentoo org> AuthorDate: Sat Jul 28 00:09:12 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Jul 29 01:40:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87056724 dev-util/tup: add new package Based on work by Cody P Schafer codyps.com> (jmesmon overlay). Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-util/tup/Manifest | 1 + dev-util/tup/metadata.xml | 11 + dev-util/tup/tup-0.7.7.ebuild | 98 +++ dev-util/tup/tup-.ebuild | 98 +++ 4 files changed, 208 insertions(+) diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest new file mode 100644 index 000..d9c8a9d735d --- /dev/null +++ b/dev-util/tup/Manifest @@ -0,0 +1 @@ +DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad diff --git a/dev-util/tup/metadata.xml b/dev-util/tup/metadata.xml new file mode 100644 index 000..390ab1cc501 --- /dev/null +++ b/dev-util/tup/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + andrey_ut...@gentoo.org + Andrey Utkin + + + gittup/tup + + diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild new file mode 100644 index 000..104dd83a9db --- /dev/null +++ b/dev-util/tup/tup-0.7.7.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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}" == ]]; 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:= + sys-fs/fuse:= +" +RDEPEND="${DEPEND}" + +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} != ]]; 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//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() { + # tup uses fuse when tracking dependencies. + addwrite /dev/fuse + + # Disabling namespacing because it leads to accessing /proc//setgroups + # which violates sandboxing. + export TUP_NO_NAMESPACING=1 + + # Skip tests which require namespacing or root privileges. + SKIPPED_TESTS=( + 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 + t5083-symlink-fullpath.sh + t5084-symlink-fullpath2.sh + t7048-full-deps.sh + ) + pushd test || die + rm ${SKIPPED_TESTS[@]} || die + ./test.sh || die + popd || die + + unset TUP_NO_NAMESPACING +} diff --git a/dev-util/tup/tup-.ebuild b/dev-util/tup/tup-.ebuild new file mode 100644 index 000..104dd83a9db --- /dev/null +++ b/dev-util/tup/tup-.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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