Cleanup due #22900

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 8 insertions, 285 deletions

diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 9a22ed45baac..28d328126d27 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libtrash
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.14 2009/09/23 21:17:35 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.15 2013/02/03 12:45:42 pacho Exp $
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/libtrash-2.2-gentoo.patch,
+  -files/libtrash-2.4-gentoo.patch, -libtrash-2.2.ebuild, -libtrash-2.8.ebuild,
+  metadata.xml:
+  Cleanup due #22900
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> libtrash-2.2.ebuild,
   libtrash-2.8.ebuild:
@@ -56,4 +61,3 @@
 
   27 Mar 2004; <matsuu@gentoo.org> libtrash-2.2.ebuild:
   Initial import. Bugs #17615.
-
diff --git a/sys-libs/libtrash/files/libtrash-2.2-gentoo.patch b/sys-libs/libtrash/files/libtrash-2.2-gentoo.patch
deleted file mode 100644
index 18379151241c..000000000000
--- a/sys-libs/libtrash/files/libtrash-2.2-gentoo.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -rC2 libtrash-2.2/cleanTrash/ct2.pl libtrash-2.0-gentoo/cleanTrash/ct2.pl
-*** libtrash-2.2/cleanTrash/ct2.pl	Tue Aug 20 13:25:09 2002
---- libtrash-2.2-gentoo/cleanTrash/ct2.pl	Sun Mar 16 10:48:05 2003
-***************
-*** 40,44 ****
-  ##########################################################################
-  # Trash-directory relative to home-dir
-! $TRASH_DIR       = '/Desktop/Trash';
-  
-  # Trash-history file relative to home-dir
---- 40,44 ----
-  ##########################################################################
-  # Trash-directory relative to home-dir
-! $TRASH_DIR       = '/Trash';
-  
-  # Trash-history file relative to home-dir
-***************
-*** 48,57 ****
-  $MAX_TRASH_SIZE  = 5000;
-  
-! # files to ignore in Trash dir (KDE friendly!)
-! @IGNORE_TRASH    = ('.directory');
-  
-  # minimum user number (by convention on many Linux systems, 'real' users
-  # have UIDs >= 500).  Set to zero to process all users
-! $MIN_USER        = 500;
-  
-  ##########################################################################
---- 48,57 ----
-  $MAX_TRASH_SIZE  = 5000;
-  
-! # files to ignore in Trash dir
-! @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        = 1000;
-  
-  ##########################################################################
-diff -rC2 libtrash-2.2/libtrash.conf libtrash-2.2-gentoo/libtrash.conf
-*** libtrash-2.2/libtrash.conf	Wed Mar  5 15:39:45 2003
---- libtrash-2.2-gentoo/libtrash.conf	Sun Mar 16 10:50:42 2003
-***************
-*** 287,291 ****
-  # below).
-  
-! UNREMOVABLE_DIRS =
-  #UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr
-  
---- 287,291 ----
-  # below).
-  
-! UNREMOVABLE_DIRS = /bin;/boot;/dev;/etc;/lib;/opt;/sbin;/usr
-  #UNREMOVABLE_DIRS=/bin;/boot;/dev;/etc;/lib;/sbin;/usr
-  
-***************
-*** 375,379 ****
-  # NOTE: This variable is ignored if global_protection is disabled.
-  
-! REMOVABLE_MEDIA_MOUNT_POINTS = /mnt
-  
-  
---- 375,379 ----
-  # NOTE: This variable is ignored if global_protection is disabled.
-  
-! REMOVABLE_MEDIA_MOUNT_POINTS = /mnt/floppy;/mnt/cdrom
-  
-  
-Only in libtrash-2.0-gentoo/src: .Makefile.swp
-diff -rC2 libtrash-2.2/src/Makefile libtrash-2.0-gentoo/src/Makefile
-*** libtrash-2.2/src/Makefile	Wed Mar  5 01:34:02 2003
---- libtrash-2.2-gentoo/src/Makefile	Sun Mar 16 10:52:26 2003
-***************
-*** 2,7 ****
-  CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
-  
-! INSTLIBDIR=/usr/local/lib
-! SYSCONFFILE=/etc/libtrash.conf
-  
-  MAJOR =2
---- 2,7 ----
-  CFLAGS=-Wall -W -Wmissing-prototypes -D_REENTRANT
-  
-! INSTLIBDIR=${DESTDIR}/usr/lib
-! SYSCONFFILE=${DESTDIR}/etc/libtrash.conf
-  
-  MAJOR =2
diff --git a/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch b/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch
deleted file mode 100644
index bc1074b9b5f9..000000000000
--- a/sys-libs/libtrash/files/libtrash-2.4-gentoo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur a/cleanTrash/ct2.pl ./cleanTrash/ct2.pl
---- a/cleanTrash/ct2.pl	2003-12-07 14:11:49.000000000 -0500
-+++ b/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 a/libtrash.conf ./libtrash.conf
---- a/libtrash.conf	2005-09-24 23:28:17.000000000 -0400
-+++ b/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 a/src/Makefile ./src/Makefile
---- a/src/Makefile	2005-09-24 22:41:06.000000000 -0400
-+++ b/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.2.ebuild b/sys-libs/libtrash/libtrash-2.2.ebuild
deleted file mode 100644
index d5b82c74d3db..000000000000
--- a/sys-libs/libtrash/libtrash-2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.2.ebuild,v 1.9 2009/10/13 13:33:07 ssuominen Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="provides a trash can by intercepting certain calls to glibc"
-HOMEPAGE="http://www.m-arriaga.net/software/libtrash/"
-SRC_URI="http://www.m-arriaga.net/software/libtrash/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ppc"
-IUSE=""
-
-DEPEND=">=sys-libs/glibc-2.3.2
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i -e "/^INSTLIBDIR/s/lib/$(get_libdir)/" "${S}"/src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /etc /usr/$(get_libdir)
-	emake DESTDIR="${D}" install || die
-
-	dosbin cleanTrash/ct2.pl
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/cleanTrash.cron
-
-	dodoc CHANGE.LOG README libtrash.conf TODO
-
-	docinto cleanTrash
-	dodoc cleanTrash/README cleanTrash/cleanTrash
-}
-
-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.8.ebuild b/sys-libs/libtrash/libtrash-2.8.ebuild
deleted file mode 100644
index 4ea5f0559aeb..000000000000
--- a/sys-libs/libtrash/libtrash-2.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-2.8.ebuild,v 1.3 2009/10/13 13:33:07 ssuominen 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="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/metadata.xml b/sys-libs/libtrash/metadata.xml
index b493e619a6d4..d9cd2cad66c2 100644
--- a/sys-libs/libtrash/metadata.xml
+++ b/sys-libs/libtrash/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>matsuu@gentoo.org</email>
+<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>