10 files changed, 32 insertions, 317 deletions
diff --git a/sys-libs/libsafe/ChangeLog b/sys-libs/libsafe/ChangeLog
index 422df6add8ea..3717dc76c763 100644
--- a/sys-libs/libsafe/ChangeLog
+++ b/sys-libs/libsafe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libsafe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.10 2009/09/23 21:16:32 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.11 2013/02/03 12:44:39 pacho Exp $
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due #22900
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> libsafe-2.0_p16-r1.ebuild:
   Remove virtual/libc
@@ -38,4 +41,3 @@
   03 Mar 2004; <matsuu@gentoo.org> libsafe-2.0_p16.ebuild:
   Initial import. Ebuild submitted by Daniel Black <groover@playful.com>.
   Bug #14720.
-
diff --git a/sys-libs/libsafe/Manifest b/sys-libs/libsafe/Manifest
index bb74d450263e..0a741d352eef 100644
--- a/sys-libs/libsafe/Manifest
+++ b/sys-libs/libsafe/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libsafe-2.0-16.tgz 360508 RMD160 ca604eaf45eeb83f776e59ebf42351b19a873443 SHA1 bb56aeb9b55be1be9a16da026c0f94211197771d SHA256 e0d78b636628d5ae8cdc05a94492bad7b182e643612f460cb449a81e7171c0b5
-EBUILD libsafe-2.0_p16-r2.ebuild 1596 RMD160 cfb8c88aad0d0cdf3926b117fee5345373da6168 SHA1 b9945848289a76c041cf1ad3bc2314c4d3d8b7d4 SHA256 76fff17c211ec46533fb3813de83e45b380a0aaaad668c002113cc3dd9a1da06
-MISC ChangeLog 1434 RMD160 429772c6269eba64fccf0cfbff9cd176762dfe4e SHA1 64faaac8feacc3be42150762da28fe3aaaef30c6 SHA256 d2e823622f29c8b0fe571e6a3770cfbd605137dd1b7636c0d56fb9c958ad8d94
-MISC metadata.xml 520 RMD160 8d67f294fe81fb0dd6b354a91663b3e3b9bb915c SHA1 1be359ea7d83b96556995805f4813bd04cf3c22d SHA256 7150c7815d6f11be7d0b9006f919b1238bd6e68abe2fbb3ec712388dd09e753d
+DIST libsafe-2.0-16.tgz 360508 SHA256 e0d78b636628d5ae8cdc05a94492bad7b182e643612f460cb449a81e7171c0b5
+EBUILD libsafe-2.0_p16-r2.ebuild 1596 SHA256 76fff17c211ec46533fb3813de83e45b380a0aaaad668c002113cc3dd9a1da06 SHA512 0a70dbb7e6583600c1afb9c1049a4fa0c31743f2b53b2943d458849d8313db3965444d65133408a610d1e443765bffbfa1ec96c566445d1f84c939ee57f53eb7 WHIRLPOOL d74da5fbfb44306e5719aa5d90cd4f95ea89b7be10e8f062ba4e301da34618f85c65f37859ba65eaf7198d44e9a0f8adc3ec4e62aa84b61ba6dcf3d64423293a
+MISC ChangeLog 1513 SHA256 e3b1c1b72f2cada64759fd80e0b7a47514aa09773e4c258ff03a04986b74bf3b SHA512 da42afc5d380bf2648b571515fb834aba0a37d526e3a8a60f4303e09a74e094427626e7d74c8d8465a3738e29e02a4ae5e7c755885d4d4b2d48477dd8fcfb332 WHIRLPOOL 896ee55b5bd8db0eee18e14d5f60b7c7f49891476b8f698aaf8b46dbf46e0d7ca12717ef748837ce9b66f6ab1754abfb33f9f0b0ff57cc74ba7f409f3e0091db
+MISC metadata.xml 529 SHA256 14d66634c67beef03f11df21a04ba1d925b9615a6b35ada82d145fa5e3dc84b1 SHA512 082ae7be9a7fe339cd7ea272f437696842e50214f79032148da6b19cd7e5b3c91d6a13e2eba1d7a80a80a5156bf251b0638fd9234092c2609590e779c3d22ede WHIRLPOOL a01237df6218b1eff5c874cc519102fd72e393820b07dd883221faa9bfa164861f73dbbfe8b84ef17be1aec5dd2a1608c1fcb092160f34bdf6f4282165a5a59d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tR4ACgkQfXuS5UK5QB2HAAQAoHktmGaaszIzaKqS/sgRkPB1
-vf5+DXZeIJ5XJ9Ki9iZY8MSAmur9v/9MtFPxih4ufS5woa+WlF7gpdzs6FmmQGk+
-Bh8JOZNXlt1WkMEXp0kf8/OcW25H7JRSIKfeqnbGDB4whpW7jEDx2m0vsdVVdmpy
-r+MFq9KMf7k6p7ynpIk=
-=MUk9
+iEYEAREIAAYFAlEOW7gACgkQCaWpQKGI+9SYZgCdHxmru/1F7iuHUWAeHjLVaFVN
+DRUAnR1nsj6fDgUl8uHJqhTxs1erXn+o
+=x3GX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsafe/metadata.xml b/sys-libs/libsafe/metadata.xml
index e8268537c302..ade6a83d0ba0 100644
--- a/sys-libs/libsafe/metadata.xml
+++ b/sys-libs/libsafe/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>matsuu@gentoo.org</email>
+<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <longdescription>The libsafe library protects a process against the exploitation of buffer overflow vulnerabilities in process stacks. Libsafe works with any existing pre-compiled executable (but is incompatible with libc5-linked processes) and can be used transparently, even on a system-wide basis.</longdescription>
 </pkgmetadata>
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/Manifest b/sys-libs/libtrash/Manifest
index 19d06ab914aa..8962987c34b8 100644
--- a/sys-libs/libtrash/Manifest
+++ b/sys-libs/libtrash/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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.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 1392 RMD160 4d91e5c7fdb4664556d95961e25a110f44fb5f1f SHA1 877969357a81248c36a692fbea886f0a005c8d9a SHA256 dee7072794f1b51c65aad7b38290d6cc4a2fe48586fdd0e2f4712f5c72162b61
-EBUILD libtrash-2.8.ebuild 1774 RMD160 eb931ee31595f6c4f2f46f5e4a877fb4a80886af SHA1 c6339729822b1cfef74e43980e4b222bb5f3f6dd SHA256 d9d4c39b523d825c35be886ffaa527cc43b8d105f5c160dc4bc99ed44f0abcfa
-EBUILD libtrash-3.2.ebuild 1714 RMD160 d92b8c48fbc42105f31731785e0c84a4c1e028a4 SHA1 8613396a531d6933f150335151f02b155db69335 SHA256 ca9c5d8d26e562407276098c1a5076c667e2093d3410bdb1f530a80fe5599389
-MISC ChangeLog 1813 RMD160 b1b35872aa1f3b282b512f8c5f349b5e244d516c SHA1 5ac89bb30d900ef57f75b923a3423a69bbe3e0d4 SHA256 13ec3a62db9eca57999303a18909aeba9fe39b23cf6c9ffedc285f3ce7c4519b
-MISC metadata.xml 201 RMD160 d72cb3677f941247cced43c6670a8d64642d5263 SHA1 552087b28a02c98c8c2426f5cab77d1089527572 SHA256 90b7d63705a9ef11d62f6fe39fe9e780d9e249d32c6b7b564ff05b818aa1f7f7
+AUX cleanTrash.cron 200 SHA256 0e92799b07c64b0f0b372b598704a1f8506dd2408dedcd46c8931d2687b127f2 SHA512 39d3480c7141c01656660f3d3ee517d5740bc7c61a96681f7b28053571602c97edcd65024343046afff1ad56411f23ea0b1f1e0ffd0bcb1ba98675ea9f470840 WHIRLPOOL 6c823c7cc2e52fd519801e84d84ed4c6f49c52fc39e6de2ff5770d36f9a96361f3f8a191eb953657aec76147f0ce31df5730af798b4e54fc32b34f78416e04ee
+AUX libtrash-3.2-gentoo.patch 2502 SHA256 609813d305040a347fa7ed18c28a66e706d7afe7cc75c0e6c617f9e81ea5b140 SHA512 dc076620ca0578fd7e1fde5aac57671212f73e03d0c0b744c6a1633818588104ae3f654a9d46470e28fb60f7cc4cd67bbb6ca48fb1e3f70f3865c15ebc34415a WHIRLPOOL e2bcc0b6b91bf00024666ef9e9eee0b37c250b7e9049befa9c4d31967b366b590a555b8279e3234dc7059be8888a628b85aaf31a3316aaf4c5c9e1b5bf66bf73
+DIST libtrash-3.2.tgz 98138 SHA256 c1bb4b941ed0eef29f9acf9f4101f8695bdb49763f80ed41647b01063d6e946f
+EBUILD libtrash-3.2.ebuild 1714 SHA256 ca9c5d8d26e562407276098c1a5076c667e2093d3410bdb1f530a80fe5599389 SHA512 02b226cddf10db185db097d5ef62e1fe0bf62a25a2b7c685096a9661708fb29159a2deaefa4660fae4baa5e28dffb98ecdb853265752e6d53971d79aa80055f4 WHIRLPOOL 6c6c81388069ee14d2aa9c525b230be8125c1c8561c11e208bb767364bdff792b9ff02199779f73ff8f14d8876ed87d585764c4d5763ff2ccafbc0aa9bb55bae
+MISC ChangeLog 2008 SHA256 338a25e71cbe9152a4d291d9cdbf16051010020824063ee8c36cb59ec82e3952 SHA512 37d362fec5574113dc8cae120b511e7819c97faed96e649883c29bba75bdc0de6c9905970ddb7fa9ba8e9ad4294ec8bb25aa3ab33b7517d0e3b2257744cf131f WHIRLPOOL 84447aab67e8f9e97a4809a1223ad84a6d80d6e0f67cd92193456f87f21c500e58cf3aa3cf032961fb347d54d002c7454340ff84f75217d2a79abacd084ef296
+MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59tRwACgkQfXuS5UK5QB05+wQAncECFbtMQTvbRkwF5ykwGXNq
-6oFTFByEf3leERyU7ffy1jYIgKZwv2Xz4/UfzrZeuBNNQeicti6TEvmpfou2LPlY
-0+QYnX0Z89C3pqcP1M9R+tN3nvo9rRbP2AC42u8JLo6PMMJ5cACHBaTrsZ6stqlB
-V354AgmCKVIHGcc53wA=
-=67aN
+iEYEAREIAAYFAlEOW/cACgkQCaWpQKGI+9SBgwCeMeFbEGxWcihnkM8uPlSn2CXP
+yZIAn1i/McqEJyVgyMSBjw4Ol7ZooAHo
+=B8qL
 -----END PGP SIGNATURE-----
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>