Version bumped. Bug 108127.

(Portage version: 2.0.53_rc7)

5 files changed, 158 insertions, 5 deletions

diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 98a4917a53f7..1bfef226d60c 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libtrash
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.6 2005/05/16 16:21:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.7 2005/11/05 05:16:30 matsuu Exp $
+
+*libtrash-2.4 (05 Nov 2005)
+
+  05 Nov 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/libtrash-2.4-gentoo.patch, +libtrash-2.4.ebuild:
+  Version bumped. Bug 108127.
 
   16 May 2005; MATSUU Takuto <matsuu@gentoo.org> libtrash-2.2.ebuild:
   Fixed inheriting gcc, Bug 92745.
diff --git a/sys-libs/libtrash/Manifest b/sys-libs/libtrash/Manifest
index 55bc7ebcdc3a..2e781553f9ce 100644
--- a/sys-libs/libtrash/Manifest
+++ b/sys-libs/libtrash/Manifest
@@ -1,6 +1,9 @@
 MD5 8031c6a11e0e508eb43880413647e767 ChangeLog 752
-MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
-MD5 6b8b68ba011a24eed705ff95f892461e libtrash-2.2.ebuild 1377
-MD5 02701c7978b919cf96660c80a3ff1a82 files/libtrash-2.2-gentoo.patch 2708
-MD5 8600c86ec08b5db06b59aa2a2e0ec2a3 files/digest-libtrash-2.2 60
 MD5 a165552d7dee01c2d7bbf914ae701cba files/cleanTrash.cron 200
+MD5 8600c86ec08b5db06b59aa2a2e0ec2a3 files/digest-libtrash-2.2 60
+MD5 d69a03bb7138b6a25e6ef708afae2823 files/digest-libtrash-2.4 60
+MD5 02701c7978b919cf96660c80a3ff1a82 files/libtrash-2.2-gentoo.patch 2708
+MD5 bd1b945f46e09170c290b6d6bc0fd0c1 files/libtrash-2.4-gentoo.patch 2632
+MD5 6b8b68ba011a24eed705ff95f892461e libtrash-2.2.ebuild 1377
+MD5 8bb0660ed0a5f9697dad4f83e5733fd5 libtrash-2.4.ebuild 1681
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
diff --git a/sys-libs/libtrash/files/digest-libtrash-2.4 b/sys-libs/libtrash/files/digest-libtrash-2.4
new file mode 100644
index 000000000000..b057cb1da311
--- /dev/null
+++ b/sys-libs/libtrash/files/digest-libtrash-2.4
@@ -0,0 +1 @@
+MD5 c335bf506cfe2433d16df71dc29acfc3 libtrash-2.4.tgz 90634
diff --git a/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch b/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch
new file mode 100644
index 000000000000..e5e96f0b43d9
--- /dev/null
+++ b/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch
@@ -0,0 +1,76 @@
+Only in ./: 01_all_libtrash-2.4-install-fix.patch
+diff -ur /tmp/libtrash-2.4/cleanTrash/ct2.pl ./cleanTrash/ct2.pl
+--- /tmp/libtrash-2.4/cleanTrash/ct2.pl	2003-12-07 14:11:49.000000000 -0500
++++ ./cleanTrash/ct2.pl	2005-10-04 17:30:15.000000000 -0400
+@@ -39,7 +39,8 @@
+ ### CONFIGURATION
+ ##########################################################################
+ # Trash-directory relative to home-dir
+-$TRASH_DIR       = '/Desktop/Trash';
++#$TRASH_DIR       = '/Desktop/Trash';
++$TRASH_DIR       = '/Trash';
+ 
+ # Trash-history file relative to home-dir
+ $TRASH_HIST_FILE = '/.trashhist';
+@@ -48,11 +49,13 @@
+ $MAX_TRASH_SIZE  = 5000;
+ 
+ # files to ignore in Trash dir (KDE friendly!)
+-@IGNORE_TRASH    = ('.directory');
++#@IGNORE_TRASH    = ('.directory');
++@IGNORE_TRASH    = ( );
+ 
+ # minimum user number (by convention on many Linux systems, 'real' users
+ # have UIDs >= 500).  Set to zero to process all users
+-$MIN_USER        = 500;
++#$MIN_USER        = 500;
++$MIN_USER        = 1000;
+ 
+ ##########################################################################
+ ### PROGRAM
+diff -ur /tmp/libtrash-2.4/libtrash.conf ./libtrash.conf
+--- /tmp/libtrash-2.4/libtrash.conf	2005-09-24 23:28:17.000000000 -0400
++++ ./libtrash.conf	2005-10-04 17:10:30.000000000 -0400
+@@ -286,8 +286,8 @@
+ # through the use of the UNCOVER_DIRS environmental variable (see
+ # below).
+ 
+-UNREMOVABLE_DIRS =
+-#UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr
++#UNREMOVABLE_DIRS =
++UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr;/opt
+ 
+ # This is a convenience configuration variable: it simply instructs
+ # libtrash to temporarily remove the listed directory(ies) from the
+@@ -374,7 +374,7 @@
+ 
+ # NOTE: This variable is ignored if global_protection is disabled.
+ 
+-REMOVABLE_MEDIA_MOUNT_POINTS = /mnt
++REMOVABLE_MEDIA_MOUNT_POINTS = /mnt/floppy;/mnt/cdrom
+ 
+ 
+ # This setting is meant to allow certain programs to function correctly
+diff -ur /tmp/libtrash-2.4/src/Makefile ./src/Makefile
+--- /tmp/libtrash-2.4/src/Makefile	2005-09-24 22:41:06.000000000 -0400
++++ ./src/Makefile	2005-10-04 17:12:09.000000000 -0400
+@@ -1,8 +1,8 @@
+ CC=gcc
+ CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
+ 
+-INSTLIBDIR=/usr/local/lib
+-SYSCONFFILE=/etc/libtrash.conf
++INSTLIBDIR=${DESTDIR}/usr/lib
++SYSCONFFILE=${DESTDIR}/etc/libtrash.conf
+ 
+ MAJOR =2
+ VERSION =2.4
+@@ -29,7 +29,7 @@
+ 	TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
+ 	TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so
+ 	TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
+-	ldconfig	
++#	ldconfig	
+ 
+ clean:
+ 	rm -f *~
diff --git a/sys-libs/libtrash/libtrash-2.4.ebuild b/sys-libs/libtrash/libtrash-2.4.ebuild
new file mode 100644
index 000000000000..a0df0c140b04
--- /dev/null
+++ b/sys-libs/libtrash/libtrash-2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.4.ebuild,v 1.1 2005/11/05 05:16:30 matsuu Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="provides a trash can by intercepting certain calls to glibc"
+HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
+SRC_URI="http://pages.stern.nyu.edu/~marriaga/software/libtrash/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+		-e "/^INSTLIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^CFLAGS/s/$/ ${CFLAGS}/" \
+		${S}/src/Makefile || die
+
+	# now let's unpack strash too in cash anyone is interested
+	cd cleanTrash
+	tar -zxf ./strash-0.9.tar.gz
+}
+
+src_compile() {
+	make CC="$(tc-getCC)" || die "Error Making Source...Exiting"
+}
+
+src_install() {
+	dodir /etc /usr/$(get_libdir)
+	make DESTDIR="${D}" install || die "Error Installing ${P}...Exiting"
+
+	dosbin cleanTrash/ct2.pl
+	exeinto /etc/cron.daily
+	doexe "${FILESDIR}"/cleanTrash.cron
+
+	dodoc CHANGE.LOG README libtrash.conf TODO config.txt
+
+	docinto cleanTrash
+	dodoc cleanTrash/README cleanTrash/cleanTrash
+
+	# new strash installation stuff
+	dosbin cleanTrash/strash-0.9/strash
+	docinto strash
+	dodoc cleanTrash/strash-0.9/README
+	doman cleanTrash/strash-0.9/strash.8
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use this you have to put the trash library as one"
+	einfo "of the variables in LD_PRELOAD."
+	einfo "Example in bash:"
+	einfo "export LD_PRELOAD=/usr/$(get_libdir)/libtrash.so"
+	einfo
+	einfo "Also, see /etc/cron.daily/cleanTrash.cron if you'd like to turn on"
+	einfo "daily trash cleanup."
+	einfo
+}