Version bumped, bug #252771.

Package-Manager: portage-2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64

5 files changed, 92 insertions, 105 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/Manifest b/sys-libs/libtrash/Manifest
index 4764b14325b8..2c45302db419 100644
--- a/sys-libs/libtrash/Manifest
+++ b/sys-libs/libtrash/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cleanTrash.cron 200 RMD160 6279326dcaf839dec9d893146c0b599d521ae7d6 SHA1 ed8acfdac8c50329743bb65ca878fd6154a95f88 SHA256 0e92799b07c64b0f0b372b598704a1f8506dd2408dedcd46c8931d2687b127f2
 AUX libtrash-2.2-gentoo.patch 2708 RMD160 e5b9d7ca393b1752d0a845c9fb57d5c676a38df1 SHA1 893840b0dbeb1ebd9eecb090644ed73dc2604ee9 SHA256 6b1a9ee3060233d4bf3c85f4c396314c3e6c171102bf57256465a3809f6e3eab
 AUX libtrash-2.4-gentoo.patch 2486 RMD160 2391905f95bb4720d6783335c57763dc721b32e5 SHA1 63b9c8564b45d7bca9f9abcbfc0c9f5d0fdd0401 SHA256 40d986291cbc457289bca0cc41c4b69ba03e2f32347cd1ec87271de986a0e70a
+AUX libtrash-3.2-gentoo.patch 2502 RMD160 ce5f6d9928b472f95e436817187d470e9c5d147b SHA1 2e5a51e38506f31696a3a285a5cb456a426b528e SHA256 609813d305040a347fa7ed18c28a66e706d7afe7cc75c0e6c617f9e81ea5b140
 DIST libtrash-2.2.tgz 89001 RMD160 517c0689a1712f2a2a9c71cb99319e128cbe1dcb SHA1 7c4b9b60fe416871cc895c0a03004f76dc7de154 SHA256 312508f630aa37f4e07dd1760d859fcaaaa6b5f7a27aefc5812f1d61a739ce86
-DIST libtrash-2.4.tgz 90634 RMD160 71482ca9db1e389ff32f5e51575c54f0d9d4c4bb SHA1 528c61ddea80dd4e909e66f1a5621edf956d1367 SHA256 39f387b55a62659afe15e3d6a308a29213458e340e9d1ebf1c68bf13a0b0d2fa
-DIST libtrash-2.6.tgz 94964 RMD160 b91e3da2651f5af0d463489e4dc3c55e47451087 SHA1 0c456c2dd0653232fa6445303488757be2a3a627 SHA256 28e12a00ac134c8a2022a439c8d2ffa5809dfb82f58bec2d32eb19154904bebc
 DIST libtrash-2.8.tgz 95336 RMD160 4026d9a4873eb0a36d23526706336f95c3e1efb9 SHA1 a63d117eced4c3b8c6987577b407c2aab1efa645 SHA256 6303507f163f424bb64e40af78f8221456bc5caf7da766dbc7c03141819014e5
+DIST libtrash-3.2.tgz 98138 RMD160 90facd30ebb4ae04c7ba28ef1947f7224a671b47 SHA1 79c94ff1eefea4749bb912c8d104d12aa30c8f5e SHA256 c1bb4b941ed0eef29f9acf9f4101f8695bdb49763f80ed41647b01063d6e946f
 EBUILD libtrash-2.2.ebuild 1377 RMD160 220463cf0b155cb680157f940d4469905f1ab6ed SHA1 f81d0db4af8f083b5d78c845238805dcea33fce1 SHA256 54136d38027294697b7b02235c3f00c9cbf49f08e6f6cf7793b80845c96094b5
-EBUILD libtrash-2.4.ebuild 1778 RMD160 7cdecca7c9fb587a6d763c17b40c858c1553f0d1 SHA1 53449a127d3b8c48bf6cb141ffda2568da9071a7 SHA256 b6fb94b5992b6de6bc8903700680b839f44f963adc67ffc56de827cc6be87aa6
-EBUILD libtrash-2.6.ebuild 1783 RMD160 66fcc0a08cfacffceeb5ef54b93df69df843a3fc SHA1 03c4804c95719839aad7ac08b3cb202f72a0054d SHA256 75668e7136df573a10a0c1abf00e422a1224c60dd9622a749feee31a2dc0b803
 EBUILD libtrash-2.8.ebuild 1783 RMD160 f14242ad069c105dd1eb931dcdfa99202511706a SHA1 b543651ffd41983a12d5db656e643b440d0fd19e SHA256 836ee9a7d465c424ab73fa8c80d6c2176c15b5e22af5abec43aa684f18a70168
-MISC ChangeLog 1484 RMD160 d8c19d9ec8f5efac37141de158716b0417153916 SHA1 80cbc3f36460a8e145b57d153fea31afa338d884 SHA256 5f97115643ee88d5f13e32de7d236a18fe9c57f70572e77355d8be5afeb0b602
+EBUILD libtrash-3.2.ebuild 1714 RMD160 d92b8c48fbc42105f31731785e0c84a4c1e028a4 SHA1 8613396a531d6933f150335151f02b155db69335 SHA256 ca9c5d8d26e562407276098c1a5076c667e2093d3410bdb1f530a80fe5599389
+MISC ChangeLog 1695 RMD160 6915df17c6163dca612d3f3e8fee4ef2c973e182 SHA1 395b334dc63a27435f77142ca9828ce65ccc2417 SHA256 2e43e729ff15c483b77d0c59f9cb1d73e4f09d4bb88a98fa32f01e3951397c8e
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh9y4ACgkQAiZjviIA2XiKlwCeJYwO0/flgplQnKdRcZGVQI9d
-dv4An05xRmKNBnUXU9nar6pvOPCNIonj
-=hLck
------END PGP SIGNATURE-----
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
 }