Bump miller-base with hard linkers

4 files changed, 35 insertions, 1 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 9dff43d..e7080e6 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -1,5 +1,7 @@
 AUX auto-download-packages 81 BLAKE2B 18de205f954967907ee4e905ea7710483a69f06e958b3d70cab0daef1945f26d85ecdf1e77c5a1ab1e4b5168a5258b3af89453125d68e0ffa30f69dc4296be21 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7
+AUX hardlink-ccache 258 BLAKE2B 8791acd75889e4d7040de86f60c42f22c6fe3aae6053f37c313fd7969c3fd3577ebcb4f42ed9e2db463e475a7d34473b577d44e563df4e70ff769f793b4fddfa SHA512 45ed484c593829a15c123d4a4ce7eff507ae6f5d7230fc786335bca05c3f455bd2e4cb4fdf239f020567a95e9972ba7b985d00c6d854a04a007255b88521a78f
 AUX kernels-cleaner 171 BLAKE2B b6c1085e0c3813048f2199524b8a7ed5e27e720b7dd642eb5115f8eab0c7d09ac938bf71e4386f4899b6f444deb56a4db9573e031aac0faf3a08fa56339728e3 SHA512 944fe9811e652a7a42f907f229bf955583a7107ccc44d2973ca65bb785b9285b6f88f6f8811d2ce26e9faa3e6d2fb0120c96b6602f8d1234ea4bc1d4726ef15d
+AUX linkfiles 427 BLAKE2B 17475db2066c91e6ae0e17b14f9f967cc65be693281c13424f1413aae644ce49aa8970ab9e781473212e9ed89745059a909f521e6d2eacc270c81ef1d2410924 SHA512 f321f700d4bd88bb60b3ddf59eb7ce28e314e33b52701e8695eef4538b69459c31c0ee9bf6d193c62b7846639871eb18581cff60c14ad54166a69e5f3a89850d
 AUX newkernel 505 BLAKE2B a33a649045d2f0b1ea28902bde704d7ff586d8b187a8ff5070f9b3336ad5297a85f1bd5c79e5ad43c66d3725ca3b576e68979145e2b97fa8c8cc9aaf42a89f95 SHA512 bb9931e9e22679f58eba9aedb6558e2ddcf34423f48968ded6e927d98f1cae462f75330bae22235ddee848c8358477bc96455a3e3f43fcf39a6e74e8148f1229
 AUX service-check.systemd 57 BLAKE2B 2cda658accd9ec3cce11a742f7ded6c26a676cba10c09830b22c933bbcfa31311ccdf1ba7e4cac31dc6779ce5c5441cfc53aa7b63965998876b85f3791dc8a7a SHA512 58d52a5623f478d2e104047c75fb89656e1cda6a7552e56f552bc075f488577dd856ec60d0e8842a07dadb700205a1dbf27baa9e8889692598d661ae26fdc114
 AUX sync-distclean-exec.cron 60 BLAKE2B 986476d7cb8a59a554ef07cebabc1d29aa99662c75d2833ae527a4fdf083166b4e5e1970b00027146dd660c439c68d1f53b7d1e4f60f4989a6d9a27dca2d833e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f
@@ -10,4 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
 AUX weekly-av-scan.cron 1591 BLAKE2B 8262ff9f7c8aadf503b8fbf0c283f87d619f1ee174bd52762cd421064e3ef6ad301dbfbfdf557334e76c11adc963976417c3275e8c1167d7c609cbdda201ead9 SHA512 6d5ca06bfdb020d1435b51837b4f2f8676cab808e7ffdf39be40e822858f0b7150d16d5fce991fab026c236fd3a32e1ff9a0f7eca62a679e77d1799ed15e2366
 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.8.4.ebuild 3731 BLAKE2B 4c90233196c0a631919a41e73b3874b56b521980c6b0b85108dbcf0b5878b3085cc65326c6bbd8524e57d7d7946193264dc34c30b07dba214c597dd15d2de9b9 SHA512 d3098f9a9fca443187797d95f9bb5734713df882cac91987993cd82b66007ba45adedf7c85829df150122a0b6defed81efebfe70a7d2a535a6d8b16088f38dbe
+EBUILD miller-base-10.8.5.ebuild 3846 BLAKE2B 64ac6f01920ba4b18bf5571125e33750435ebfad539ccddb07409a5df4edf6a869f484ea874e9abeca21c4627218e395a49d80124b93a0fab75249c0417ba02b SHA512 4d7c566f4003cefac7d1cfdeca40c8b943f02f05ac2d8b14d73a52167a21dc306366bcef1f3f996bd01fd1622cfe4cbae8f319131482bfd5da8076e0bc7d9169
diff --git a/virtual/miller-base/files/hardlink-ccache b/virtual/miller-base/files/hardlink-ccache
new file mode 100755
index 0000000..afee96c
--- /dev/null
+++ b/virtual/miller-base/files/hardlink-ccache
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+getent passwd | cut -d: -f6 | sort -u | while read h ; do
+	CCACHE_BASEDIR=$h/.ccache
+	if [[ -e $CCACHE_BASEDIR ]] ; then
+		realpath $CCACHE_BASEDIR
+	fi
+done | sort -u | while read d ; do
+				echo "Hard linking $d..."
+				hardlink -mopt $d
+done
+
diff --git a/virtual/miller-base/files/linkfiles b/virtual/miller-base/files/linkfiles
new file mode 100755
index 0000000..3f67f8d
--- /dev/null
+++ b/virtual/miller-base/files/linkfiles
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+RO_DIRS=$(portageq envvar PORTAGE_RO_DISTDIRS)
+DISTDIR=$(portageq envvar DISTDIR)
+
+if [[ -z $RO_DIRS ]] ; then
+	echo "No PORTAGE_RO_DISTDIRS"
+	exit 1;
+fi
+
+find -L $DISTDIR -maxdepth 1 -type l -delete
+
+find $RO_DIRS -maxdepth 1 -type f -printf '%f %p\n' \
+			 | sort -u -k1,1 \
+			 | cut -d ' ' -f 2 \
+			 | grep -Ff <(find $DISTDIR -maxdepth 1 -type f -printf '/%f\n') \
+			 | xargs -r ln -s -v -f -r -t $DISTDIR
+
diff --git a/virtual/miller-base/miller-base-10.8.4.ebuild b/virtual/miller-base/miller-base-10.8.5.ebuild
index 897e27a..7684761 100644
--- a/virtual/miller-base/miller-base-10.8.4.ebuild
+++ b/virtual/miller-base/miller-base-10.8.5.ebuild
@@ -100,6 +100,7 @@ src_install() {
 	exeinto /etc/cron.weekly
 	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
 	use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner
+	use !minimal && newexe "${FILESDIR}"/hardlink-ccache hardlink-ccache
 
 	if [ -n "${UPDATETIME}" ]; then
 		mkdir -p ${D}/etc/cron.d
@@ -117,6 +118,7 @@ src_install() {
 	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
 	newexe "${FILESDIR}"/newkernel 80-newkernel
 	newexe "${FILESDIR}"/systemd-reload 90-systemd-reload
+	newexe "${FILESDIR}"/linkfiles 98-linkfiles
 	if use autoupdate ; then
 		dosym /sbin/update-install /etc/portage/postsync.d/75-update-install
 		if use autoshutdown ; then