From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-util/tup/Manifest | 6 ++- dev-util/tup/tup-0.7.7.ebuild | 9 +++- dev-util/tup/tup-0.7.8.ebuild | 100 ++++++++++++++++++++++++++++++++++++++++++ dev-util/tup/tup-9999.ebuild | 20 +++++---- 4 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 dev-util/tup/tup-0.7.8.ebuild (limited to 'dev-util/tup') diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest index 0bd6534c1172..7bbb079ea143 100644 --- a/dev-util/tup/Manifest +++ b/dev-util/tup/Manifest @@ -1,4 +1,6 @@ DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad -EBUILD tup-0.7.7.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e -EBUILD tup-9999.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e +DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5 +EBUILD tup-0.7.7.ebuild 2499 BLAKE2B 27dc4b8f2be59038c7256feeeb0edbd49580fe3b8c018834cf2255ea37f95b9e8898894620a10ff25098b8966aadc9c26a73650c663fb50ff0017a5e394c80f2 SHA512 ae2cdc51894567ae76ccf2b03ab2afbb07d6648e2230a2a94ac8edb4857e3cc40815e05a21343999bb40465922957196a88cc7debb1001bb772b0a6d8fbe53a2 +EBUILD tup-0.7.8.ebuild 2432 BLAKE2B b551f08ef0a190305eca5b3c6bc8151d85062c1e20ee9021faeabe96c367afb1def59f64fbdc6869bb24c79389cd57bc3d217b8bf9cb31b02546e9987eed6749 SHA512 49b29bb44d75761c0525a37472e3d1b245d34324e4dddbc936e0d1de10799e4d0cf56b58cf814f7d4a8600d0764df4902d811ea59d5913622f7935321782c7c5 +EBUILD tup-9999.ebuild 2432 BLAKE2B b551f08ef0a190305eca5b3c6bc8151d85062c1e20ee9021faeabe96c367afb1def59f64fbdc6869bb24c79389cd57bc3d217b8bf9cb31b02546e9987eed6749 SHA512 49b29bb44d75761c0525a37472e3d1b245d34324e4dddbc936e0d1de10799e4d0cf56b58cf814f7d4a8600d0764df4902d811ea59d5913622f7935321782c7c5 MISC metadata.xml 326 BLAKE2B edaa58be0e147ba52e73b1e4ad70250ee2ebf7c31beda95bc4f639dc4759b4a2515a3f927b4c5c3e644a66a58180df7ef6874893908d6ffc55181c8a554f3a70 SHA512 cd0c6ad8e43779608355cc4bd23a03a88d2920ff15269f2b130395f955fe58d63029d6f8567b021c4f546d0c41e8af3d866c0de4b72d042be1ec6eff72cc0154 diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild index 104dd83a9dbd..194cf670515f 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 \ @@ -65,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-0.7.8.ebuild b/dev-util/tup/tup-0.7.8.ebuild new file mode 100644 index 000000000000..2662d05de6fd --- /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}" == 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//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 +} diff --git a/dev-util/tup/tup-9999.ebuild b/dev-util/tup/tup-9999.ebuild index 104dd83a9dbd..2662d05de6fd 100644 --- a/dev-util/tup/tup-9999.ebuild +++ b/dev-util/tup/tup-9999.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" @@ -26,10 +26,15 @@ 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 \ @@ -65,6 +70,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 @@ -73,23 +79,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 -- cgit v1.2.3