Version bumped, bug #252771.

(Portage version: 2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 88 insertions, 90 deletions

diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 2564ce7f3536..77f7c857758b 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libtrash
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.12 2008/11/17 22:58:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.13 2008/12/30 01:33:22 matsuu Exp $
+
+*libtrash-3.2 (30 Dec 2008)
+
+  30 Dec 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/libtrash-3.2-gentoo.patch, -libtrash-2.4.ebuild,
+  -libtrash-2.6.ebuild, +libtrash-3.2.ebuild:
+  Version bumped, bug #252771.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/libtrash-2.4-gentoo.patch:
diff --git a/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch b/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
new file mode 100644
index 000000000000..97f11e8ef533
--- /dev/null
+++ b/sys-libs/libtrash/files/libtrash-3.2-gentoo.patch
@@ -0,0 +1,62 @@
+diff -Naur libtrash-3.2.orig/cleanTrash/ct2.pl libtrash-3.2/cleanTrash/ct2.pl
+--- libtrash-3.2.orig/cleanTrash/ct2.pl	2003-12-08 04:11:49.000000000 +0900
++++ libtrash-3.2/cleanTrash/ct2.pl	2008-12-30 10:13:12.000000000 +0900
+@@ -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';
+@@ -52,7 +53,8 @@
+ 
+ # 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 -Naur libtrash-3.2.orig/libtrash.conf libtrash-3.2/libtrash.conf
+--- libtrash-3.2.orig/libtrash.conf	2007-12-04 08:33:34.000000000 +0900
++++ libtrash-3.2/libtrash.conf	2008-12-30 10:16:12.000000000 +0900
+@@ -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;/lib32;/lib64;/sbin;/usr;/opt
+ 
+ # This is a convenience configuration variable: it simply instructs
+ # libtrash to temporarily remove the listed directory(ies) from the
+diff -Naur libtrash-3.2.orig/src/Makefile libtrash-3.2/src/Makefile
+--- libtrash-3.2.orig/src/Makefile	2008-01-23 21:41:24.000000000 +0900
++++ libtrash-3.2/src/Makefile	2008-12-30 10:21:10.000000000 +0900
+@@ -1,5 +1,5 @@
+ CC=gcc
+-CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
++CFLAGS+=-Wall -W -Wmissing-prototypes -D_REENTRANT
+ 
+ INSTLIBDIR=/usr/local/lib
+ SYSCONFFILE=/etc/libtrash.conf
+@@ -32,10 +32,10 @@
+         -o libtrash.so.${VERSION} -ldl
+ 
+ install-libtrash: 
+-	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	
++	TRASH_OFF=YES install libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so.${VERSION}
++	TRASH_OFF=YES ln -sf libtrash.so.${VERSION} $(DESTDIR)${INSTLIBDIR}/libtrash.so
++	TRASH_OFF=YES install libtrash.conf.sys --mode a=r $(DESTDIR)${SYSCONFFILE}
++#	ldconfig	
+ 
+ clean:
+ 	rm -f *~
diff --git a/sys-libs/libtrash/libtrash-2.6.ebuild b/sys-libs/libtrash/libtrash-2.6.ebuild
deleted file mode 100644
index cbc3b235f74a..000000000000
--- a/sys-libs/libtrash/libtrash-2.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.6.ebuild,v 1.1 2007/05/01 17:00:08 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}"/${PN}-2.4-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
-}
diff --git a/sys-libs/libtrash/libtrash-2.4.ebuild b/sys-libs/libtrash/libtrash-3.2.ebuild
index a0df0c140b04..a1564eb7626c 100644
--- a/sys-libs/libtrash/libtrash-2.4.ebuild
+++ b/sys-libs/libtrash/libtrash-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-3.2.ebuild,v 1.1 2008/12/30 01:33:22 matsuu Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,34 +13,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	dev-lang/perl"
+DEPEND="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
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	sed -i -e "/^INSTLIBDIR/s:local/lib:$(get_libdir):" src/Makefile || die
 
 	# now let's unpack strash too in cash anyone is interested
 	cd cleanTrash
-	tar -zxf ./strash-0.9.tar.gz
+	unpack ./strash-0.9.tar.gz
 }
 
 src_compile() {
-	make CC="$(tc-getCC)" || die "Error Making Source...Exiting"
+	emake CC="$(tc-getCC)" || die "Error Making Source...Exiting"
 }
 
 src_install() {
 	dodir /etc /usr/$(get_libdir)
-	make DESTDIR="${D}" install || die "Error Installing ${P}...Exiting"
+	emake DESTDIR="${D}" install || die "Error Installing ${P}...Exiting"
 
 	dosbin cleanTrash/ct2.pl
 	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/cleanTrash.cron
+	doexe "${FILESDIR}/cleanTrash.cron"
 
 	dodoc CHANGE.LOG README libtrash.conf TODO config.txt
 
@@ -55,13 +51,13 @@ src_install() {
 }
 
 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
+	elog
+	elog "To use this you have to put the trash library as one"
+	elog "of the variables in LD_PRELOAD."
+	elog "Example in bash:"
+	elog "export LD_PRELOAD=/usr/$(get_libdir)/libtrash.so"
+	elog
+	elog "Also, see /etc/cron.daily/cleanTrash.cron if you'd like to turn on"
+	elog "daily trash cleanup."
+	elog
 }