Patch for deleting dirs, worked with Jens (author) on this, closes bug 126514.

Package-Manager: portage-2.1.1_rc1-r3

4 files changed, 80 insertions, 10 deletions

diff --git a/app-misc/filer/ChangeLog b/app-misc/filer/ChangeLog
index a3d45792287c..51653b583628 100644
--- a/app-misc/filer/ChangeLog
+++ b/app-misc/filer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/filer
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/ChangeLog,v 1.20 2006/07/06 13:01:35 ian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/ChangeLog,v 1.21 2006/09/06 14:39:34 mcummings Exp $
+
+  06 Sep 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/filer-0.0.12-trash.patch, filer-0.0.12.ebuild:
+  Patch for deleting dirs, worked with Jens (author) on this, closes bug 126514.
 
   06 Jul 2006; Christian Hartmann <ian@gentoo.org> -filer-0.0.6.ebuild,
   -filer-0.0.10.ebuild, filer-0.0.12.ebuild:
diff --git a/app-misc/filer/Manifest b/app-misc/filer/Manifest
index ae899dba7de8..811c0c376651 100644
--- a/app-misc/filer/Manifest
+++ b/app-misc/filer/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX filer-0.0.12-trash.patch 1341 RMD160 d4302c68874d063cf4c198e5209dabedb8a9b7be SHA1 37e84f43e4992e02bbe5f1e9d8b01c1633515cf4 SHA256 871ce81aea0617915d82123e2774c43ec429175dbe58423877ceb68a29e60279
+MD5 6e331731ee526cb9a4cd961809360f3d files/filer-0.0.12-trash.patch 1341
+RMD160 d4302c68874d063cf4c198e5209dabedb8a9b7be files/filer-0.0.12-trash.patch 1341
+SHA256 871ce81aea0617915d82123e2774c43ec429175dbe58423877ceb68a29e60279 files/filer-0.0.12-trash.patch 1341
 DIST filer-0.0.12.tar.gz 116853 RMD160 72b0c25efbe6425266b7210e17494ef308b5e0c3 SHA1 57d4b0152390f96367b60b7437be565deb75e077 SHA256 e13e893ffdc751da7a4ce9c60d247face795d0edf758b3c7323216b43c2b7a2d
-EBUILD filer-0.0.12.ebuild 1054 RMD160 69ddcdc060a43e41e64e8c28208fcdd90aca82a8 SHA1 febe9333a96a9490c57f5166af627524a3470c19 SHA256 b940d7a0e15077da12b53d26521c0ac482dd37d79509cce07d97b7ccf91a57fc
-MD5 971859c65fcfddbd3ef18ec6632e1b4f filer-0.0.12.ebuild 1054
-RMD160 69ddcdc060a43e41e64e8c28208fcdd90aca82a8 filer-0.0.12.ebuild 1054
-SHA256 b940d7a0e15077da12b53d26521c0ac482dd37d79509cce07d97b7ccf91a57fc filer-0.0.12.ebuild 1054
-MISC ChangeLog 2586 RMD160 2a7da6522d7caaa7dd721c6891249a9c2600f3a3 SHA1 02999b06e6b6287e8ad3d36a47240db42a42ab09 SHA256 5aa48f68e1aab0ce119397eb779d66bf0f9166909a6454050977e8344b9d8db9
-MD5 32993064b60de626668443257a96e691 ChangeLog 2586
-RMD160 2a7da6522d7caaa7dd721c6891249a9c2600f3a3 ChangeLog 2586
-SHA256 5aa48f68e1aab0ce119397eb779d66bf0f9166909a6454050977e8344b9d8db9 ChangeLog 2586
+EBUILD filer-0.0.12.ebuild 1130 RMD160 fa7dba98aedd679cce645d3de95867a97364adc8 SHA1 ed8db9c99cf1e2838a80376874a8a3be86f3a72d SHA256 65ef2cfa4bd4a15cc5de05ed685753cba6a03c73630fc6fa6dfa3cfd5187ccde
+MD5 0eebe999f60a2e75e0801fe108d69b05 filer-0.0.12.ebuild 1130
+RMD160 fa7dba98aedd679cce645d3de95867a97364adc8 filer-0.0.12.ebuild 1130
+SHA256 65ef2cfa4bd4a15cc5de05ed685753cba6a03c73630fc6fa6dfa3cfd5187ccde filer-0.0.12.ebuild 1130
+MISC ChangeLog 2785 RMD160 1280d2e0c28919fea5af594a24d2f57f9d10e18e SHA1 d37482d6fda8f22a8b7f3bef83a68b71aa42eff5 SHA256 b7e86db3292b47530bc27311fc812e95ce9467c32432409a499efb65280c8874
+MD5 58bb0273c3de05ca6ed02e258a90f5a9 ChangeLog 2785
+RMD160 1280d2e0c28919fea5af594a24d2f57f9d10e18e ChangeLog 2785
+SHA256 b7e86db3292b47530bc27311fc812e95ce9467c32432409a499efb65280c8874 ChangeLog 2785
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -14,3 +21,10 @@ SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata
 MD5 49df36087c75db2d316cd5074ce8ca5f files/digest-filer-0.0.12 238
 RMD160 15920a9f313207e29931c3d789b2f97be6e8f9e4 files/digest-filer-0.0.12 238
 SHA256 8fe180011201cebbfd6aace04c10ce0cff6a74d62678ed24832dd355e067fa93 files/digest-filer-0.0.12 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE/t2ttG5z4I8BtQoRAhHRAJwO4QkX90r5zXXbsBUmdQzRXEixwACgiJbs
+/Oop+zjtq4B3QBYSeEydr1I=
+=Prng
+-----END PGP SIGNATURE-----
diff --git a/app-misc/filer/filer-0.0.12.ebuild b/app-misc/filer/filer-0.0.12.ebuild
index 6339ac1c284b..2b23daa2054a 100644
--- a/app-misc/filer/filer-0.0.12.ebuild
+++ b/app-misc/filer/filer-0.0.12.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/filer-0.0.12.ebuild,v 1.6 2006/07/06 13:01:35 ian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/filer-0.0.12.ebuild,v 1.7 2006/09/06 14:39:34 mcummings Exp $
+
+inherit eutils
 
 DESCRIPTION="Small file-manager written in perl"
 HOMEPAGE="http://blog.perldude.de/archives/category/programming/filer/"
@@ -29,6 +31,7 @@ DEPEND="sys-apps/findutils"
 src_unpack() {
 	unpack ${A}
 	find ${S} -type d -name .svn | xargs rm -rf
+	cd ${S}; epatch ${FILESDIR}/filer-0.0.12-trash.patch
 }
 
 src_compile() {
diff --git a/app-misc/filer/files/filer-0.0.12-trash.patch b/app-misc/filer/files/filer-0.0.12-trash.patch
new file mode 100644
index 000000000000..655427f1d638
--- /dev/null
+++ b/app-misc/filer/files/filer-0.0.12-trash.patch
@@ -0,0 +1,49 @@
+diff -Naurp filer-0.0.12/Filer/Config.pm filer-0.0.12.new/Filer/Config.pm
+--- filer-0.0.12/Filer/Config.pm	2005-07-03 14:48:23.000000000 -0400
++++ filer-0.0.12.new/Filer/Config.pm	2006-09-06 10:28:03.000000000 -0400
+@@ -22,7 +22,15 @@ use warnings;
+ sub new {
+ 	my ($class,$side) = @_;
+ 	my $self = bless {}, $class;
+-	$self->{cfg_home} = (new File::BaseDir)->xdg_config_home . "/filer";
++
++	my $xdg_config_home = File::BaseDir::xdg_config_home;
++	my $xdg_data_home = File::BaseDir::xdg_data_home;
++
++	$self->{cfg_home} = "$xdg_config_home/filer";
++
++	if (! -e $xdg_config_home) {
++		mkdir($xdg_config_home);
++	}
+ 
+ 	# move old config directory if it exists:
+ 	if (-e "$ENV{HOME}/.filer/") {
+@@ -30,14 +38,24 @@ sub new {
+ 		rename("$ENV{HOME}/.filer", $self->{cfg_home});
+ 	}
+ 
+-	if (! -e File::BaseDir::xdg_config_home) {
+-		mkdir(File::BaseDir::xdg_config_home);
+-	}
+-
+ 	if (! -e $self->{cfg_home}) {
+ 		mkdir($self->{cfg_home});
+ 	}
+ 
++	if (! -e $xdg_data_home) {
++		mkdir($xdg_data_home);
++	}
++
++	my $trashdir = $xdg_data_home . "/Trash";
++	my $trashdir_files = "$trashdir/files";
++	my $trashdir_info = "$trashdir/info";
++
++    if (! -e $trashdir) {
++        mkdir($trashdir);
++        mkdir($trashdir_files);
++        mkdir($trashdir_info);
++    }
++
+ 	if (! -e "$self->{cfg_home}/config") {
+ 		my $cfg = {
+ 			PathLeft		=> $ENV{HOME},