From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-util/ccache/Manifest | 7 +-- dev-util/ccache/ccache-3.7.8-r1.ebuild | 71 ---------------------- dev-util/ccache/ccache-3.7.8.ebuild | 70 --------------------- dev-util/ccache/ccache-3.7.9.ebuild | 2 +- .../ccache/files/ccache-3.4-size-on-disk.patch | 22 ------- .../files/ccache-3.6-disable-sized-cleanup.patch | 26 -------- 6 files changed, 2 insertions(+), 196 deletions(-) delete mode 100644 dev-util/ccache/ccache-3.7.8-r1.ebuild delete mode 100644 dev-util/ccache/ccache-3.7.8.ebuild delete mode 100644 dev-util/ccache/files/ccache-3.4-size-on-disk.patch delete mode 100644 dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch (limited to 'dev-util/ccache') diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index a5dc25b2ccd3..d4fb5a5942be 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,13 +1,8 @@ -AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9ac83df956af274bd088909ae973af18c476b408f126ad59e60c69fc1ed02f90b0021074a24ca47f804f539063303dd3 SHA512 9e8eba9926fd8e8b90572365729388bf1bfdadae9cab8b739a614de10759bf69d709075fd92c77d1945e45cc4f6c3865c694a2129d7c30f0b14f2324b4df2133 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72 -AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d AUX ccache-3.7.8-dev-null.patch 1915 BLAKE2B db860ccdab29862922d08fd9af5426d04e8871b74c717efc2bcff1084e66f262be287ce8c3c6ce5c84dfd3c03457183dfe38bb77afe76be2f8edeb7e97e46822 SHA512 dece4fa910f2477fc481d974915b47928b130afcdc278b3b0fe5c71eb63f2c65e400e7d07826d42cf7086ff8e1a702b348557a7b96bbe22ce25113209e1dd2b6 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816 -DIST ccache-3.7.8.tar.xz 352528 BLAKE2B 8d8896b100c43a3e9a60445c95369cd8898fdbf653fc4d5791b8e1abc0191882319078d619429213a5f6968a1dbc639808037459c80514cea775d261c83b949a SHA512 dc8cc9cd5f6f054421f0ecb50f66e0af85222c347d59fecd4555dfe1d8d6cbdca304818de8bc8a39fc1a1225567c141ce104ac315369bf6c307e9da67e14b51c DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf -EBUILD ccache-3.7.8-r1.ebuild 1470 BLAKE2B 06a6684242b4dd5ac5bdd1a3fbb2c88e4d3b711757acc3ebf6d10889001404655658ed33fd0e4f5a52ec373a63cd4d21caf2e5a84e00809d7d7bed7a000604d1 SHA512 a377a4a03ff589ea08574431194ee49509beb7838d73bd6aa1f2051086126561b9f391baef2f00b4e6e1769f3803d4bec9a3bef4746a4a1763bd03eb82042120 -EBUILD ccache-3.7.8.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11 -EBUILD ccache-3.7.9.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11 +EBUILD ccache-3.7.9.ebuild 1420 BLAKE2B 1026f3de97a608a5f0915ca33750764b382a3060c0723b04664e08c61f3d05c762437e601c26a2fdcbb914b76369ec0e668181ca3695cce4ca228e15e9ec8a92 SHA512 c0bc8910eec9dcc6a96e62676f45e2f92abaf0615c3328d2223229cdd86d584cf43fd0c34c073d2062349c157e4522c385b35498c182f167d35e0aae16860d8a MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249 diff --git a/dev-util/ccache/ccache-3.7.8-r1.ebuild b/dev-util/ccache/ccache-3.7.8-r1.ebuild deleted file mode 100644 index 620e3f3c820e..000000000000 --- a/dev-util/ccache/ccache-3.7.8-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="fast compiler cache" -HOMEPAGE="https://ccache.dev/" -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="test" - -DEPEND="app-arch/xz-utils - sys-libs/zlib" -RDEPEND="${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions" -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -DEPEND+=" - test? ( dev-libs/elfutils )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch - "${FILESDIR}"/${PN}-3.7.8-dev-null.patch -) - -src_prepare() { - default - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die -} - -src_configure() { - econf --without-bundled-zlib -} - -src_compile() { - emake V=1 -} - -src_test() { - emake check V=1 -} - -src_install() { - DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - default - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ ${ROOT:-/} == / ]]; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/ccache-3.7.8.ebuild b/dev-util/ccache/ccache-3.7.8.ebuild deleted file mode 100644 index 32f24f67e079..000000000000 --- a/dev-util/ccache/ccache-3.7.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="fast compiler cache" -HOMEPAGE="https://ccache.dev/" -SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="test" - -DEPEND="app-arch/xz-utils - sys-libs/zlib" -RDEPEND="${DEPEND} - dev-util/shadowman - sys-apps/gentoo-functions" -# clang-specific tests use dev-libs/elfutils to compare objects for equality. -# Let's pull in the dependency unconditionally. -DEPEND+=" - test? ( dev-libs/elfutils )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-nvcc-test.patch -) - -src_prepare() { - default - - sed \ - -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-3 > ccache-config || die -} - -src_configure() { - econf --without-bundled-zlib -} - -src_compile() { - emake V=1 -} - -src_test() { - emake check V=1 -} - -src_install() { - DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md ) - default - - dobin ccache-config - insinto /usr/share/shadowman/tools - newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin" -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then - eselect compiler-shadow remove ccache - fi -} - -pkg_postinst() { - if [[ ${ROOT:-/} == / ]]; then - eselect compiler-shadow update ccache - fi -} diff --git a/dev-util/ccache/ccache-3.7.9.ebuild b/dev-util/ccache/ccache-3.7.9.ebuild index 32f24f67e079..375861046c2c 100644 --- a/dev-util/ccache/ccache-3.7.9.ebuild +++ b/dev-util/ccache/ccache-3.7.9.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="test" DEPEND="app-arch/xz-utils diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch deleted file mode 100644 index a2f4a554cab3..000000000000 --- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/456178 -https://github.com/ccache/ccache/issues/442 - -stick to the size of files on disk rather than their byte size. -this func is only used for stats management, so this should be safe. - ---- a/src/util.c -+++ b/src/util.c -@@ -845,12 +845,7 @@ file_size(struct stat *st) - #ifdef _WIN32 - return (st->st_size + 1023) & ~1023; - #else -- size_t size = st->st_blocks * 512; -- if ((size_t)st->st_size > size) { -- // Probably a broken stat() call... -- size = (st->st_size + 1023) & ~1023; -- } -- return size; -+ return st->st_blocks * 512; - #endif - } - diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch deleted file mode 100644 index dcb5cf1f497a..000000000000 --- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/649440 -https://github.com/ccache/ccache/issues/442 - -Disable cleanup based on free filesystem size. - ---- a/test/suites/cleanup.bash -+++ b/test/suites/cleanup.bash -@@ -75,6 +75,9 @@ SUITE_cleanup() { - done - - # ------------------------------------------------------------------------- -+# Disable test in Gentoo as we don't control temporary filesystem: -+# https://bugs.gentoo.org/649440 -+if false; then - TEST "Forced cache cleanup, size limit" - - # NOTE: This test is known to fail on filesystems that have unusual block -@@ -101,7 +104,7 @@ SUITE_cleanup() { - file=$CCACHE_DIR/a/result$i-4017.o - expect_file_exists $file - done -- -+fi - # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup, limit_multiple 0.9" - -- cgit v1.2.3