Version bump. Added myself to metadata.xml. Dropped old.

(Portage version: 2.1.4)

10 files changed, 110 insertions, 101 deletions

diff --git a/app-admin/tmpreaper/ChangeLog b/app-admin/tmpreaper/ChangeLog
index 4e0c869a4f54..41e644a259a5 100644
--- a/app-admin/tmpreaper/ChangeLog
+++ b/app-admin/tmpreaper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/tmpreaper
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/ChangeLog,v 1.14 2007/06/07 15:05:30 genstef Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/ChangeLog,v 1.15 2008/01/25 02:13:51 hawking Exp $
+
+*tmpreaper-1.6.9 (25 Jan 2008)
+
+  25 Jan 2008; Ali Polatel <hawking@gentoo.org>
+  -files/tmpreaper-1.6.6-fix-protect.patch,
+  +files/tmpreaper-1.6.9-gentoo.patch, metadata.xml,
+  -tmpreaper-1.6.5.ebuild, -tmpreaper-1.6.6-r1.ebuild,
+  +tmpreaper-1.6.9.ebuild:
+  Version bump. Added myself to metadata.xml. Dropped old.
 
 *tmpreaper-1.6.7 (07 Jun 2007)
 
diff --git a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.5 b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.5
deleted file mode 100644
index 74ed3e7b6419..000000000000
--- a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4188c71b4fbb73af1d2f3046ddfec86f tmpreaper_1.6.5.tar.gz 111249
-RMD160 57e4a3470a278e845f1e122eeeb54de288e3a3e7 tmpreaper_1.6.5.tar.gz 111249
-SHA256 bda75aa235f9de8557a26210e078faeae95fcfbb603b254d7b3f47295ab503e0 tmpreaper_1.6.5.tar.gz 111249
diff --git a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1 b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1
deleted file mode 100644
index cfe5082bf34b..000000000000
--- a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a534f8876f318102d7a5ec38584200e tmpreaper_1.6.6.tar.gz 119219
-RMD160 f3979b4506e18e4029fa03420f74be885d4175ec tmpreaper_1.6.6.tar.gz 119219
-SHA256 c0b16e0b123b2ec965047ad94ba7430330aae4e1d017105f9151a4c11d4e5202 tmpreaper_1.6.6.tar.gz 119219
diff --git a/app-admin/tmpreaper/files/digest-tmpreaper-1.6.9 b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.9
new file mode 100644
index 000000000000..40cd91a66c3d
--- /dev/null
+++ b/app-admin/tmpreaper/files/digest-tmpreaper-1.6.9
@@ -0,0 +1,3 @@
+MD5 fb42442c3ee681d669a3326f4195259e tmpreaper_1.6.9.tar.gz 121902
+RMD160 6d965a0d250cb77739b26c9ff149e0c1a2c9a50e tmpreaper_1.6.9.tar.gz 121902
+SHA256 1c79c7eaffafceb17458a683e7060963187b81a0cdd36fb2dd2140a1d3f443a6 tmpreaper_1.6.9.tar.gz 121902
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
deleted file mode 100644
index a76c80dd5fc7..000000000000
--- a/app-admin/tmpreaper/files/tmpreaper-1.6.6-fix-protect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- tmpreaper.c.orig	2006-12-05 10:55:58.000000000 -0800
-+++ tmpreaper.c	2006-12-05 10:56:46.000000000 -0800
-@@ -467,6 +467,21 @@
- 		    continue;
- 		}
- 
-+		if (FLAGS_PROTECT_P (flags)) {
-+		    skip = i = 0;
-+		    do {
-+			if (sb.st_ino == protect_table[i].inode) {
-+			    message (LOG_VERBOSE,
-+				     "Entry matching `--protect' pattern skipped. `%s'\n",
-+				     protect_table[i].name);
-+			    skip = 1;
-+			    break;
-+			}
-+		    } while (protect_table[i++].name);
-+		    if (skip)
-+			continue;
-+		}
-+
- 		if (S_ISDIR (sb.st_mode)) {
-                     char *dst;
- 
-@@ -489,21 +504,6 @@
- 			     (u_int) getpid(), ent->d_name);
- 		}
- 
--		if (FLAGS_PROTECT_P (flags)) {
--		    skip = i = 0;
--		    do {
--			if (sb.st_ino == protect_table[i].inode) {
--			    message (LOG_VERBOSE,
--				     "Entry matching `--protect' pattern skipped. `%s'\n",
--				     protect_table[i].name);
--			    skip = 1;
--			    break;
--			}
--		    } while (protect_table[i++].name);
--		    if (skip)
--			continue;
--		}
--
- 		/* Decide whether to remove the file or not */
- 		/* check for mtime on directory instead of atime if requested */
- 		if ( FLAGS_MTIME_P(flags) ||
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.9-gentoo.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.9-gentoo.patch
new file mode 100644
index 000000000000..0e3c3d4a6ad8
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.9-gentoo.patch
@@ -0,0 +1,35 @@
+diff -ur tmpreaper-1.6.9/debian/cron.daily tmpreaper-1.6.9-gentoo/debian/cron.daily
+--- tmpreaper-1.6.9/debian/cron.daily	2007-08-20 12:19:13.000000000 +0300
++++ tmpreaper-1.6.9-gentoo/debian/cron.daily	2008-01-25 03:43:51.000000000 +0200
+@@ -32,17 +32,7 @@
+ 
+ # Set config defaults
+ SHOWWARNING=''
+-
+-# get the TMPREAPER_TIME value from /etc/default/rcS
+-
+-if grep '^TMPTIME=' /etc/default/rcS >/dev/null 2>&1; then
+-    eval $(grep '^TMPTIME=' /etc/default/rcS)
+-    if [ -n "$TMPTIME" -a "$TMPTIME" -gt 0 ]; then
+-        TMPREAPER_TIME=${TMPTIME}d
+-    else
+-        TMPREAPER_TIME=7d
+-    fi
+-fi
++TMPREAPER_TIME=''
+ 
+ # ! Important !  The "set -f" below prevents the shell from expanding
+ #                file paths, which is vital for the configuration below to work.
+diff -ur tmpreaper-1.6.9/debian/tmpreaper.conf tmpreaper-1.6.9-gentoo/debian/tmpreaper.conf
+--- tmpreaper-1.6.9/debian/tmpreaper.conf	2006-12-08 14:24:03.000000000 +0200
++++ tmpreaper-1.6.9-gentoo/debian/tmpreaper.conf	2008-01-25 03:44:14.000000000 +0200
+@@ -40,8 +40,7 @@
+ # TMPREAPER_ADDITIONALOPTIONS
+ #       extra options that are passed to tmpreaper, e.g. --all
+ 
+-# uncomment and change the next line to overrule the /etc/default/rcS value
+-# TMPREAPER_TIME=7d
++TMPREAPER_TIME=7d
+ 
+ TMPREAPER_PROTECT_EXTRA=''
+ TMPREAPER_DIRS='/tmp/.'
diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
index 9f3fdee2246b..ef8e6e102193 100644
--- a/app-admin/tmpreaper/metadata.xml
+++ b/app-admin/tmpreaper/metadata.xml
@@ -3,6 +3,24 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hawking@gentoo.org</email>
+		<name>Ali Polatel</name>
 	</maintainer>
+	<longdescription lang="en">
+	tmpreaper is a program that can be used to clean out temporary-file
+	directories. It recursively searches the directory, refusing to chdir()
+	across symlinks, and removes files that haven't been accessed in a
+	user-specified amount of time. You can specify a set of files to protect
+	from deletion with a shell pattern. It will not remove files owned by the
+	process EUID that have the `w' bit clear, unless you ask it to, much like
+	`rm -f'. `tmpreaper' will not remove symlinks, sockets, fifos, or special
+	files unless given a command line option enabling it to.
+
+	WARNING: Please do not run `tmpreaper' on `/'. There are no protections
+	against this written into the program, as that would prevent it from
+	functioning the way you'd expect it to in a `chroot(8)' environment.
+
+	The daily tmpreaper run can be configured through /etc/tmpreaper.conf . 
+	</longdescription>
 </pkgmetadata>
+
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.5.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.5.ebuild
deleted file mode 100644
index 73aa77a4b389..000000000000
--- a/app-admin/tmpreaper/tmpreaper-1.6.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.5.ebuild,v 1.5 2005/04/27 14:04:16 herbs Exp $
-
-DESCRIPTION="A utility for removing files based on when they were last accessed"
-HOMEPAGE="http://packages.debian.org/stable/admin/tmpreaper.html"
-SRC_URI="mirror://debian/pool/main/t/tmpreaper/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make installl failed"
-	dodoc README ChangeLog debian/{cron.daily,tmpreaper.conf,README*}
-}
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild
deleted file mode 100644
index 7e81beb70f6b..000000000000
--- a/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.6-r1.ebuild,v 1.2 2006/12/05 19:21:10 masterdriverz Exp $
-
-inherit eutils
-
-DESCRIPTION="A utility for removing files based on when they were last accessed"
-HOMEPAGE="http://packages.debian.org/stable/admin/tmpreaper.html"
-SRC_URI="mirror://debian/pool/main/t/tmpreaper/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-protect.patch"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog debian/{cron.daily,tmpreaper.conf,README*}
-}
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild
new file mode 100644
index 000000000000..1fa419c41815
--- /dev/null
+++ b/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpreaper/tmpreaper-1.6.9.ebuild,v 1.1 2008/01/25 02:13:51 hawking Exp $
+
+inherit eutils
+
+DESCRIPTION="A utility for removing files based on when they were last accessed"
+HOMEPAGE="http://packages.debian.org/sid/tmpreaper"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	insinto /etc
+	doins debian/tmpreaper.conf || die "failed to install"
+
+	exeinto /etc/cron.daily
+	newexe debian/cron.daily tmpreaper || die "failed to install cron script"
+	doman debian/tmpreaper.conf.5 || die
+	dodoc README ChangeLog debian/README* || die
+}
+
+pkg_postinst() {
+	elog "This package installs a cron script under /etc/cron.daily"
+	elog "You can configure it using /etc/tmpreaper.conf"
+	elog "Consult tmpreaper.conf man page for more information"
+	elog "Read /usr/share/doc/tmpreaper-1.6.9/README.security and"
+	elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
+}