From 7dd14a480a5cc76251705e097fbf37e9a09e34c2 Mon Sep 17 00:00:00 2001
From: Matsuu Takuto <matsuu@gentoo.org>
Date: Sat, 5 Nov 2005 05:16:30 +0000
Subject: Version bumped. Bug 108127. (Portage version: 2.0.53_rc7)

---
 sys-libs/libtrash/files/digest-libtrash-2.4       |  1 +
 sys-libs/libtrash/files/libtrash-2.4-gentoo.patch | 76 +++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 sys-libs/libtrash/files/digest-libtrash-2.4
 create mode 100644 sys-libs/libtrash/files/libtrash-2.4-gentoo.patch

(limited to 'sys-libs/libtrash/files')

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 *~
-- 
cgit v1.2.3-65-gdbad