Merge branch 'edge' into next

4 files changed, 0 insertions, 265 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 207038369144..a5dc25b2ccd3 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,15 +3,10 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435
 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.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
-DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893a1e399dd9f934b345ea27999b3750be6b474caf2bcaea77eb9281f99623312aa55dc5b5ffb7cf5e670b173f4 SHA512 c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba
 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.2.ebuild 2124 BLAKE2B f5b45838863629b0706eef8da70d3c94318b61ad7f8b4dafa63d805794d001ec32894830538021a55d1c6af88a8e5fb76a699bb5bb9cdca970f48f10d4436a1a SHA512 b15f8d43d7e4487abdacc31bdfa4a87746d528e2760111087507b71d54fca1806c17f102ef9b4e8d4e9f613265d44a9ca056d57374fecb1ad286123d2c8dc456
-EBUILD ccache-3.7.6.ebuild 2194 BLAKE2B bcb4d276405b962fefedbff9509071c00b5e5a3712514b3dca773f7710fd8ce9f3d8da24231068ff46579e58a77989d21e75c9f94e5b3ab37d1f54ba76268362 SHA512 0a8bf30ea68543c490a2c7b9e343e6c1ec4dd4487cf92ccb2eaf461102d9bd80b67164f74b99ce54fb1158738c4d34884151809d5a23b69ba47d09ceab503219
 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
-EBUILD ccache-3.7.7.ebuild 2195 BLAKE2B 75e92e265e3daf5d40d1d32b226ae9009bdc0848611c7594441280ddc76cec3986aaa1fb48692a6d2dcf796fda4deaccad28d9a76847072a2eb8a0f71ca54df0 SHA512 530953304727f3385e2c9998181709d273ee56e3d471ad569b8b4a8ababdb6eff1c3b47e1130ae7087e72fa4f9c1783e3851bba72a4308be7ab627a2a1f7dbef
 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
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
deleted file mode 100644
index 77db723bad24..000000000000
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-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=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
-)
-
-src_prepare() {
-	default
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-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 <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-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
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
deleted file mode 100644
index 271109bf94aa..000000000000
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-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 it 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
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-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 <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-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
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.7.7.ebuild b/dev-util/ccache/ccache-3.7.7.ebuild
deleted file mode 100644
index 84e1e14d82b0..000000000000
--- a/dev-util/ccache/ccache-3.7.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-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 it 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
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-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 <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-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
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}