gentoo resync : 21.08.2021

4 files changed, 23 insertions, 25 deletions

diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 8fc285761aa7..239dd4f833ab 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,5 +1,5 @@
 AUX tmpwatch-2.11-boottime.patch 1034 BLAKE2B 37d257d39c8b7734e08f2498d07ac1d30e029a22c6ba70f2127f5a6a2d443555794022590e31445479ff145b9440695682aeb5be0102929ee9630c8a6527ce44 SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92
-AUX tmpwatch.cron 1533 BLAKE2B fd6e4ed53bb72e881a0dc92301ec04cf376dba40c2294973daaf8a353972664fb56da6e0f17b3ac161e189f9b7e5b9e883a7d2b5f64e4f909206432fb1163a90 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016
+AUX tmpwatch.cron 1462 BLAKE2B 02dd8a5bf13816a7bb23cea219b6852fe73ed906da5a9b961c86c61068caa7bcf4e59a6b126a56d3226be0f1a4f4ef390e5dec979d2a3e4e89c2c468b6e299ed SHA512 12f1da682bc8e0961a3d83f099b8cd0184795276cd22d8e4f792f02f7043476b30b20e2b8647b123f3084aa1be20c28db2ca58014a0eba9343cba1e6b093c323
 DIST tmpwatch-2.11.tar.bz2 145609 BLAKE2B ee66c77138e6f35030de817528ece1b3fa19622804e179fbc5c70c27281a52b8e8f7c7f631c9de73eb05085363852e91ee5a619de7db9a597a9f88afd95e164b SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97
-EBUILD tmpwatch-2.11-r2.ebuild 770 BLAKE2B 5b0e1e29f43f5accf3e4069ab6eb5f17503119fbe2d0dc886f4070ebec9b52d5e5949cf7cd19d9a62ee5e80def76835457156e764a4afec44d40c27e5f48cf25 SHA512 00bac9457bc1235eec06f68e35d3dddd91a083a911e80653f3237a9de19f96f5268d769b7f355675d10c96daf474cd78ad9f69b54d9977abe455f1b9a5c95b01
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD tmpwatch-2.11-r3.ebuild 770 BLAKE2B 5b0e1e29f43f5accf3e4069ab6eb5f17503119fbe2d0dc886f4070ebec9b52d5e5949cf7cd19d9a62ee5e80def76835457156e764a4afec44d40c27e5f48cf25 SHA512 00bac9457bc1235eec06f68e35d3dddd91a083a911e80653f3237a9de19f96f5268d769b7f355675d10c96daf474cd78ad9f69b54d9977abe455f1b9a5c95b01
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron
index 806b1453e552..d35a590379d7 100644
--- a/app-admin/tmpwatch/files/tmpwatch.cron
+++ b/app-admin/tmpwatch/files/tmpwatch.cron
@@ -1,47 +1,45 @@
 #!/bin/sh
-# vim: ft=sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 
 # This cron script contains several (commented out) examples.  You may use
 # them as is, by uncommenting them, or modify them to suit your needs.  Read
 # tmpwatch(8) for more information on tmpwatch parameters.
 
-### Variables ###
-
-TMPWATCH="/usr/sbin/tmpwatch"
-#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage"
-#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)"
-#DISTDIR="$(portageq distdir)"
-
 ### EXAMPLES ###
 
 # NOTE: if you have noatime in /etc/fstab for any partitions you plan on
 # running tmpwatch on, you should obviously change any of the examples that
 # use atime (-u|--atime).  Those that don't specify anything, default to 
-# atime.
-
-# NOTE2: the time value is in HOURS!
+# atime. Be aware that the time value is in HOURS!
 
 # Delete everything in /tmp that haven't been accessed in a week (>=168 hrs).
 #
-# if [[ -d /tmp ]]; then
-#   ${TMPWATCH} --atime 168 /tmp
+# if [ -d /tmp ]; then
+# 	tmpwatch --atime 168 /tmp
 # fi
 
 # Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks.
 #
-# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then
-#   ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage}
+# if PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR) &&
+# 	[ -d "${PORTAGE_TMPDIR}/portage" ] &&
+# 	! pgrep -x emerge >/dev/null
+# then
+# 	tmpwatch --mtime --all 336 "${PORTAGE_TMPDIR}/portage"
 # fi
 
 # Delete everything in DISTDIR that hasn't been accessed in 6 months (going
-# by 30 day months)
+# by 30 day months).
 #
-# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then
-#   ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles}
+# if DISTDIR=$(portageq distdir) && [ -d "${DISTDIR}" ]; then
+# 	tmpwatch --atime --fuser 4320 "${DISTDIR}"
 # fi
 
-# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks
+# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks.
 #
-# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then
-#   ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage}
+# if { PORTAGE_LOGDIR=$(portageq envvar PORTAGE_LOGDIR) ||
+# 	PORTAGE_LOGDIR=$(portageq envvar PORT_LOGDIR); } &&
+# 	[ -d "${PORTAGE_LOGDIR}" ]
+# then
+# 	tmpwatch --atime 772 "${PORTAGE_LOGDIR}"
 # fi
diff --git a/app-admin/tmpwatch/metadata.xml b/app-admin/tmpwatch/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/app-admin/tmpwatch/metadata.xml
+++ b/app-admin/tmpwatch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild
index cdc308efa9f9..cdc308efa9f9 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild