summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/tmpwatch')
-rw-r--r--app-admin/tmpwatch/files/tmpwatch.cron40
-rw-r--r--app-admin/tmpwatch/metadata.xml4
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild (renamed from app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild)18
3 files changed, 33 insertions, 29 deletions
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..115e9d64a669 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">
+<!DOCTYPE pkgmetadata SYSTEM "https://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 a4978b8144ad..ff0389caa5b2 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
DESCRIPTION="Files which haven't been accessed are removed from specified directories"
HOMEPAGE="https://pagure.io/tmpwatch"
@@ -11,11 +11,17 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
IUSE="selinux"
-RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
-DEPEND=""
+# psmisc for fuser
+DEPEND="
+ !kernel_Darwin? ( sys-process/psmisc )
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-tmpreaper )
+"
PATCHES=(
"${FILESDIR}/${P}-boottime.patch"