punt slocate

15 files changed, 0 insertions, 905 deletions

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
deleted file mode 100644
index 6243e8a6be77..000000000000
--- a/sys-apps/slocate/ChangeLog
+++ /dev/null
@@ -1,316 +0,0 @@
-# ChangeLog for sys-apps/slocate
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.88 2010/10/08 02:19:11 leio Exp $
-
-  08 Oct 2010; Mart Raudsepp <leio@gentoo.org> slocate-2.7-r8.ebuild:
-  Drop to ~mips
-
-  11 Apr 2010; Mike Frysinger <vapier@gentoo.org>
-  files/slocate-3.1-cron2.patch:
-  Only run cronjob when on AC power #312583 by Daniel Troeder.
-
-  15 Aug 2009; Mike Frysinger <vapier@gentoo.org> slocate-3.1-r2.ebuild:
-  Respect CC/CPPFLAGS env vars #280847 by Chris Slycord.
-
-  07 Feb 2009; Mike Frysinger <vapier@gentoo.org>
-  files/slocate-3.1-cron2.patch:
-  Allow people to disable ionice args #257475 by Jan-Matthias Braun.
-
-  02 Dec 2008; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
-  Add ocfs/ocfs2 to PRUNEFS #249590 by Oleg Gawriloff.
-
-*slocate-3.1-r2 (19 Aug 2008)
-
-  19 Aug 2008; Mike Frysinger <vapier@gentoo.org>
-  +files/slocate-3.1-CVE-2007-0227.patch, +files/slocate-3.1-NUL.patch,
-  +files/slocate-3.1-cron2.patch, files/updatedb.conf,
-  +slocate-3.1-r2.ebuild:
-  Add patch from Debian for CVE 2007-0227. Run updatedb through ionice
-  #231203 by Daniel Pielmeier. Add support by marty rosenberg for -0 (NUL
-  delimited output) #216838.
-
-  06 Feb 2008; nixnut <nixnut@gentoo.org> slocate-3.1-r1.ebuild:
-  stable on ppc wrt bug #180360
-
-  06 Feb 2008; Raúl Porcel <armin76@gentoo.org> slocate-3.1-r1.ebuild:
-  alpha/ia64 stable wrt #180360
-
-  06 Feb 2008; Christoph Mende <angelos@gentoo.org> slocate-3.1-r1.ebuild:
-  Stable on amd64, bug #180360
-
-  06 Feb 2008; Ferris McCormick <fmccor@gentoo.org> slocate-3.1-r1.ebuild:
-  Sparc stable --- Bug #180360 --- can rebuild database and locate things.
-
-  06 Feb 2008; Brent Baude <ranger@gentoo.org> slocate-3.1-r1.ebuild:
-  stable ppc64, bug 180360
-
-  04 Feb 2008; Jeroen Roovers <jer@gentoo.org> slocate-3.1-r1.ebuild:
-  Stable for HPPA (bug #180360).
-
-  04 Feb 2008; Dawid Węgliński <cla@gentoo.org> slocate-3.1-r1.ebuild:
-  Stable on x86 (bug #180360)
-
-  04 Feb 2008; Mike Frysinger <vapier@gentoo.org> slocate-3.1-r1.ebuild:
-  When upgrading from slocate-2.x, delete the slocate db as they are
-  incompatible.
-
-  02 Dec 2007; Mike Frysinger <vapier@gentoo.org> slocate-2.7-r8.ebuild,
-  slocate-3.1-r1.ebuild:
-  Allow people to have both slocate and locate groups at the same time #200949
-  by Timothy Stotts.
-
-  25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
-  files/slocate-3.1-cron.patch:
-  Dont bother doing a chown in the cron job as the slocate binary itself will
-  do chown() #180488 by Andri.
-
-  08 Aug 2007; Luca Barbato <lu_zero@gentoo.org> files/updatedb.conf:
-  Add spufs to the pruned file systems
-
-  23 Jul 2007; Mike Frysinger <vapier@gentoo.org> slocate-2.7-r8.ebuild,
-  slocate-3.1-r1.ebuild:
-  Punt bindnow-flags usage.
-
-  12 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
-  Exclude selinuxfs from the db #170120 by Vlastimil Holer.
-
-  27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
-  Fixing SHA256 digest, pass four
-
-  29 Apr 2006; Joshua Kinard <kumba@gentoo.org> slocate-2.7-r8.ebuild:
-  Marked stable on mips.
-
-  21 Apr 2006; Seemant Kulleen <seemant@gentoo.org>
-  files/slocate-3.1-cron.patch:
-  change the chown to use the new coreutils convention of : to separate user
-  from group, instead of a . sign.
-
-*slocate-3.1-r1 (21 Apr 2006)
-
-  21 Apr 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/slocate-3.1-cron.patch, +slocate-3.1-r1.ebuild:
-  Fixup cron script #130435 by Caster.
-
-*slocate-3.1 (19 Apr 2006)
-
-  19 Apr 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/slocate-3.1-build.patch, +files/slocate-3.1-incompat-warning.patch,
-  +slocate-3.1.ebuild:
-  Version bump 130286 by F. Steinel.
-
-  17 Apr 2006; Markus Rothe <corsair@gentoo.org> slocate-2.7-r8.ebuild:
-  Stable on ppc64; bug #130079
-
-  17 Apr 2006; Chris White <chriswhite@gentoo.org> slocate-2.7-r8.ebuild:
-  amd64 stable for bug #130079.
-
-  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> slocate-2.7-r8.ebuild:
-  Stable on x86 wrt bug #130079.
-
-  16 Apr 2006; Bryan Østergaard <kloeri@gentoo.org slocate-2.7-r8.ebuild:
-  Stable on alpha, bug 130079.
-
-  15 Apr 2006; Jason Wever <weeve@gentoo.org> slocate-2.7-r8.ebuild:
-  Stable on SPARC wrt bug #130079.
-
-  15 Apr 2006; <nixnut@gentoo.org> slocate-2.7-r8.ebuild:
-  Stable on ppc. Bug #130079
-
-  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> slocate-2.7-r8.ebuild:
-  Use bindnow-flags function instead of -Wl,-z,now.
-
-  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  13 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/slocate-2.7-really-long-paths.patch, slocate-2.7-r8.ebuild:
-  Patch from Fedora to fix #104378.
-
-  05 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/updatedb.conf:
-  Exclude /root/.ccache, bug #90344
-
-  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
-  Clean up updatedb.conf as directed by Nikolai Weibull in #97377.
-
-*slocate-2.7-r8 (31 May 2005)
-
-  31 May 2005; Mike Frysinger <vapier@gentoo.org> +slocate-2.7-r8.ebuild:
-  Use a common "locate" group instead of "slocate" to work with rlocate.
-
-*slocate-2.7-r7 (20 Oct 2004)
-
-  20 Oct 2004; Sven Wegener <swegener@gentoo.org> -slocate-2.7-r6.ebuild,
-  +slocate-2.7-r7.ebuild:
-  Revision bump to distribute a fixed version for the suid root issue.
-
-  20 Oct 2004; Sven Wegener <swegener@gentoo.org> slocate-2.7-r6.ebuild:
-  Don't install slocate suid root but sgid slocate.
-
-*slocate-2.7-r6 (14 Oct 2004)
-
-  14 Oct 2004; Mike Frysinger <vapier@gentoo.org> +slocate-2.7-r6.ebuild:
-  Version bump with debian patch #65560 by Johannes Günther.
-
-  14 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf,
-  slocate-2.7-r5.ebuild:
-  Prune ramfs (since we kill tmpfs and such) #54080.
-
-  27 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> slocate-2.7-r5.ebuild:
-  Use ROOT in pkg_postinst; error messages; error check sed
-
-  27 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -slocate-2.7-r2.ebuild,
-  -slocate-2.7-r3.ebuild, -slocate-2.7-r4.ebuild:
-  prune ebuilds
-
-  22 Jul 2004; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
-  Add subfs to the prune list #56432 by Andreas Simon.
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> slocate-2.7-r5.ebuild:
-  uclibc patch is in DISTDIR. Thanks Mr Bones
-
-  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> slocate-2.7-r5.ebuild:
-  uclibc patch thanks to Peter S. Mazinger <ps.m@gmx.net>
-
-  15 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> files/updatedb.conf:
-  Added nnpfs to the PRUNEFS line. (bug #54035)
-
-  22 May 2004; Robert Coie <rac@gentoo.org> slocate-2.7-r5.ebuild:
-  Add shadow to RDEPEND, it's used in postinst
-
-  19 Apr 2004; Jon Portnoy <avenj@gentoo.org> slocate-2.7-r5.ebuild :
-  Update DEPEND to contain automake. Add RDEPEND to not contain 
-  automake. Bug #46084. Also marked stable on AMD64.
-
-  15 Mar 2004; Joshua Kinard <kumba@gentoo.org> slocate-2.7-r5.ebuild:
-  Marked stable on mips.
-
-  02 Mar 2004; Brian Jackson <iggy@gentoo.org> slocate-2.7-r5.ebuild:
-  adding initial s390 support
-
-  01 Mar 2004; Tom Gall <tgall@gentoo.org> slocate-2.7-r5.ebuild:
-  ppc64 needs sys-devel/automake
-
-  17 Jan 2004; Christian Birchinger <joker@gentoo.org> slocate-2.7-r5.ebuild:
-  Added sparc stable keyword
-
-  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r5.ebuild:
-  nice updatedb for #37871, and clean up the ebuild
-
-*slocate-2.7-r5 (10 Jan 2004)
-
-  11 Jan 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r5.ebuild :
-  Marked stable on hppa.
-
-  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> slocate-2.7-r5.ebuild,
-  files/updatedb.conf:
-  Add devpts and usbfs to the list of pruned filesystems. Bump revision as this
-  is a runtime change.
-
-  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r4.ebuild:
-  stable on x86, alpha, ia64
-
-*slocate-2.7-r4 (06 Jan 2004)
-
-  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r4.ebuild:
-  Bump revision to carry in config file change below (which is a run-time
-  change)
-
-  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/updatedb.conf:
-  Add supermount to the list of pruned filesystems
-
-  01 Nov 2003; Douglas Russell <puggy@gentoo.org> slocate-2.7-r2.ebuild,
-  slocate-2.7-r3.ebuild:
-  Fixed a couple of user.group chown bugs to user:chown to work with usernames
-  containing a "."
-
-*slocate-2.7-r3 (31 Oct 2003)
-
-  31 Oct 2003; Brian Jackson <iggy@gentoo.org> slocate-2.7-r3.ebuild
-  files/updatedb.conf:
-  adding sysfs to PRUNEFS, closes bug 32345, thanks to jforman@austin.rr.com
-
-  08 Oct 2003; <solar@gentoo.org> slocate-2.7-r2.ebuild:
-  permission fix for when sfperms is found in FEATURES, added a metadata.xml
-
-*slocate-2.7-r2 (17 Apr 2003)
-
-  18 Aug 2003; Joshua Kinard <kumba@gentoo.org> slocate-2.7-r2.ebuild:
-  Changed ~mips to mips in KEYWORDS
-
-  05 Jun 2003; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r2.ebuild:
-  Add dependency on sed-4
-
-  05 Jun 2003; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r2.ebuild:
-  Mark stable on alpha
-
-  06 May 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r2.ebuild :
-  Added sys-apps/shadow to DEPEND since pkg_postinst() use groupmod and
-  groupadd.
-
-  19 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r2.ebuild:
-  Make the group existance checking smarter
-
-  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> files/updatedb.conf:
-  Add ncpfs to default pruned filesystems
-
-  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r2.ebuild:
-  Apply patch from bug 19279, ebuild fixes, and install a working updatedb.conf
-  file
-
-*slocate-2.7-r1 (12 Apr 2003)
-
-  13 Apr 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r1.ebuild :
-  Added hppa to KEYWORDS.
-
-  13 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
-  slocate-2.7-r1.ebuild:
-  Fixing entry in updatedb.conf (now points to right doc dir)
-
-  12 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r1.ebuild:
-  Additional cleanups (no functional changes)
-
-  12 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r1.ebuild:
-  Fixage for sandbox and comments
-
-  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
-  slocate-2.7-r1.ebuild:
-  OK, I bumped the version just because of people worrying about the bogus error
-  messages that slocate puts out when first run. For instance without a db file,
-  locate will error out. With a blank db file, it will report nothing, as
-  expected. So, we check if a db file exists, if not, we install a blank one.
-  Additionally, slocate cries about an update.conf file, so we just create a
-  blank one with a note pointing to the sample one in the doc folder.
-
-*slocate-2.7 (02 Feb 2003)
-
-  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> slocate-2.7.ebuild,
-  files/updatedb.conf:
-  some cleanups, and install a blank config file with a note about the doc'd
-  sample config file
-
-  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
-  slocate-2.6.ebuild, slocate-2.7.ebuild:
-  added other arches
-
-  30 Mar 2003; Martin Holzer <mholzer@gentoo.org> slocate-2.7.ebuild, files/updatedb.conf:
-  Added updatedb.conf. Closes #18440.
-
-  02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Security update.
-
-*slocate-2.6 (09 Jul 2002)
-
-  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> : slocate-2.6.ebuild :
-  Fixed Permissions for crontab file.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-  20 Jul 2002; Mark Guertin <gerk@gentoo.org> slocate-2.6.ebuild :
-  Added ppc to keywords
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> slocate-2.6.ebuild :
-  Added KEYWORDS, SLOT.
-
-  09 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ChangeLog :
-
-  Added ChangeLog.
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
deleted file mode 100644
index 7ee3b9f3d878..000000000000
--- a/sys-apps/slocate/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX slocate-2.7-bounds.patch 305 RMD160 df8f220cdf25d98e2fa9fd0e054b2151b3a4b1ad SHA1 a82e6f131ecc6109ac8e8546ba543913e151f39e SHA256 59ce3339cacaa817d65031fae80c0bd96962f01915511a096e47fafa295d5e8f
-AUX slocate-2.7-really-long-paths.patch 538 RMD160 d592621e92a5fd3c5e15e64fad4c307eddbdfb86 SHA1 b3e9918d171eeb35c4ef569e590bff1586aeee78 SHA256 3d2ab6ec4cbb2b87a358e93018e6f77f6bbad18eaffbd47d8b6acdec20480e83
-AUX slocate-3.1-CVE-2007-0227.patch 1200 RMD160 541519f6d3ff303ed99abbe40205819e9b2b8d57 SHA1 3c6b438321bdda5d1650ac8725bf394e77c6e9a4 SHA256 085c837ecc9d374b37270ddc1ee6507375954ca96d59af29d264b271642d942c
-AUX slocate-3.1-NUL.patch 1883 RMD160 d52a0ccebba857133159f43e5c5bba05134aaf34 SHA1 87d0544f1489190d8b23e2ca7b378ab91d1b3603 SHA256 abbb472b46ebc4709f9c4f1f09d5e8110765cee31372fc54736166996272c528
-AUX slocate-3.1-build.patch 1258 RMD160 1eaac141880c84e33e1673b253d6b0a6bb1f37f3 SHA1 328c1d36e26c7f47ac4ea8f0619efd6a45bbb918 SHA256 aded9d720df1ca41c83acabb29e97e37079df9cf214b524d419e4b8692d13733
-AUX slocate-3.1-cron.patch 352 RMD160 9a987c16e5b3f26b8453cbc8bea53b9f0513ffaa SHA1 8a54b02e1af14468abfe57e3bff7687e1b0ac1da SHA256 e5d97b84e7de76721820606a33a8d517f6715b8c11fa6ff9c790c46d832e766f
-AUX slocate-3.1-cron2.patch 807 RMD160 32421fb1c5d7996e43d22a593da9cd46d4efcc06 SHA1 c5f6815522123b23eba97d12e57d6e1a5dbbe6d7 SHA256 fe389e7034713886e2e685af6906f2a4497d8e6240b0e797f8600052d719ac3a
-AUX slocate-3.1-incompat-warning.patch 528 RMD160 4220d1c38e050e8eeff4f524ed1cd6b2da5d62d4 SHA1 2cd98e3f83ea8bd8466e7ece5ca747020bcb54ed SHA256 ba9c9806c2e2058e5644f74b7697d58ea8a3f004e4f35885cbb97354a89dd9ac
-AUX updatedb.conf 790 RMD160 473661873758e58de47a5483efcbe71825c82177 SHA1 15045e12c9a80109a18a43de534d6c0572ba3761 SHA256 82ccc00dc753c8748fbda66e5bc15245de2844e160b44ff1c288db912a1f18ff
-DIST slocate-2.7-debian.patch.bz2 2623 RMD160 9e6e96dfe2ca8b203f657993a3a81378459841c5 SHA1 1e79ae1e2faca851ca7f11fb64024c1489cee495 SHA256 ccacaa44d29a739f67916bc74ae5154c1090d2555aca345cefc5aaba212d4c4a
-DIST slocate-2.7-uclibc-sl_fts.patch.bz2 7566 RMD160 bc614e9717e6c4a2bc8247d7140cfcefae8f3219 SHA1 7082ded9745704228126a0e0a762cc459e5e13f5 SHA256 a980650613df9524f428ad2f6722a24149fe348f3422b60c59673dc6400fab77
-DIST slocate-2.7.tar.gz 87240 RMD160 0aa08da7b958be5c8fec7c4655e42373d8faf2cc SHA1 b5de4668b61b137f3f5fa9f17b334f56b9424f90 SHA256 ddff733fcc5f240d40361c5acbce0011b2204efc506efb0da63c8d0e38947dcf
-DIST slocate-3.1.tar.gz 37748 RMD160 d3b1e818cc35ce8e87ec1b0764f6b2145a319e13 SHA1 e427552664385b86931b7626c26bd95ae5f9f085 SHA256 6abec68ab50fa743739fb78a5063c295ae2f7d04d2e538f7c3108120e49a3266
-EBUILD slocate-2.7-r8.ebuild 2761 RMD160 0cdcad1b5093754f605eb145884be3cadc956b41 SHA1 a0125284c63e019c964bad5fdd58d085e5f271b4 SHA256 5432857d2000e28e9b66d849f7c062b8cb585693d64c16a23c9d1ba2605d12f3
-EBUILD slocate-3.1-r1.ebuild 2203 RMD160 9f18a8ea1cb6ab3c17699a93a3a6a40a8ec1b5fe SHA1 7e628ebf474930bb1235e7f5d0d376e7e0ee8652 SHA256 bb013625ca9a0c536d4ec446d9a867feade0a46515c612eb45e48e1671f67e70
-EBUILD slocate-3.1-r2.ebuild 2374 RMD160 ddb200b1240492657d57d5d622bdd2e2502c4f32 SHA1 391b77ceeb79c686dd7596f6dcaee3834082eb71 SHA256 3395ea5f81f1ea3934e00144d82ce1b0ca66790058c99f4a65e4da86d0b0d13e
-MISC ChangeLog 11694 RMD160 cc322883b5cf05af63e1cf763cd2dde5084c5ae8 SHA1 d2614993a383a13477ea74f03744d141225fb91d SHA256 209e97870c3d5dbcae10166509c7bd9bfea883514b6cb1dd5a74a5ac13921da6
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/slocate/files/slocate-2.7-bounds.patch b/sys-apps/slocate/files/slocate-2.7-bounds.patch
deleted file mode 100644
index b370d12842e6..000000000000
--- a/sys-apps/slocate/files/slocate-2.7-bounds.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Snatched from Fedora.
-
---- slocate-2.7/main.c
-+++ slocate-2.7/main.c
-@@ -1265,6 +1265,11 @@
- 
- 		pathlen = code_ptr - codedpath;
- 
-+		if (pathlen < 0) {
-+			fprintf(stderr,"%s: decode_db() aborted. Corrupt database?\n",progname);
-+			exit(1);
-+		}
-+		
- 		jump = 0;
- 		while (!jump) {
- 			ch = *begin_ptr;
diff --git a/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch b/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch
deleted file mode 100644
index faf7001c9a83..000000000000
--- a/sys-apps/slocate/files/slocate-2.7-really-long-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Sniped from Fedora
-
-http://bugs.gentoo.org/104378
-http://www.securityfocus.com/bid/14640
-
---- slocate/main.c
-+++ slocate/main.c
-@@ -1057,6 +1057,10 @@
- 		if (!file)
- 		    break;
- 		
-+ 		/* fts_read () from glibc fails with EOVERFLOW when fts_pathlen
-+ 		   would overflow the u_short file->fts_pathlen. */
-+ 		if (file->fts_info == FTS_D && file->fts_pathlen > 32768)
-+ 			fts_set(dir,file,FTS_SKIP);
- 		if (file->fts_info != FTS_DP && file->fts_info != FTS_NS) {
- 			
- 			if ((EXCLUDE && !match_exclude(file->fts_path,"")) || !EXCLUDE)
diff --git a/sys-apps/slocate/files/slocate-3.1-CVE-2007-0227.patch b/sys-apps/slocate/files/slocate-3.1-CVE-2007-0227.patch
deleted file mode 100644
index 18b52ba4d824..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-CVE-2007-0227.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-stolen from debian:
-
-  * Include patch to prevent users obtaining names of private files
-    (apply patch directly, since no patch system is used so far)
-    (Closes: #411937) Fixes: CVE-2007-0227
-    Thanks to Kees Cook
-
---- slocate-3.1.orig/src/utils.c
-+++ slocate-3.1/src/utils.c
-@@ -524,6 +524,7 @@
- {
- 	struct stat path_stat;
- 	int ret = 0;
-+	char *path_copy = NULL;
- 	char *ptr = NULL;
- 
- 	if (lstat(path, &path_stat) == -1)
-@@ -532,15 +533,25 @@
- 	if (!S_ISLNK(path_stat.st_mode)) {
- 		if (access(path, F_OK) != 0)
- 		    goto EXIT;
--	} else if ((ptr = rindex(path, '/'))) {
--		*ptr = 0;
--		if (access(path, F_OK) == 0)
--		    ret = 1;
--		*ptr = '/';
--		goto EXIT;
- 	}
- 
-+	/* "path" is const, so we shouldn't modify it.  Also, for speed,
-+	 * I suspect strdup/free is less expensive than the deep access
-+	 * checks... */
-+	if (!(path_copy = strdup(path)))
-+		goto EXIT;
-+
- 	ret = 1;
-+
-+	/* Each directory leading to the file (symlink or not) must be
-+	 * readable for us to allow it to be listed in search results. */
-+	while (ret && (ptr=rindex(path_copy,'/'))) {
-+		*ptr=0;
-+		if (*path_copy && access(path_copy, R_OK) != 0)
-+		    ret = 0;
-+	}
-+	free(path_copy);
-+
- EXIT:
- 	return ret;
- }
diff --git a/sys-apps/slocate/files/slocate-3.1-NUL.patch b/sys-apps/slocate/files/slocate-3.1-NUL.patch
deleted file mode 100644
index cfd13392686e..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-NUL.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-add an -0 argument to output results with NUL bytes
-
-http://bugs.gentoo.org/216838
-
-patch by marty rosenberg
-
---- slocate-3.1/src/cmds.c
-+++ slocate-3.1/src/cmds.c
-@@ -129,6 +129,7 @@
- 	       "   --output=<file>    - Specifies the database to create.\n"
- 	       "   -d <path>\n"
- 	       "   --database=<path>  - Specfies the path of databases to search in.\n"
-+	       "   -0                 - Delimit results with \\0 rather than \\n\n"
- 	       "   -h\n"
- 	       "   --help             - Display this help.\n"
- 	       "   -v\n"
-@@ -707,7 +708,7 @@
- 	if (strcmp(g_data->progname, "updatedb") == 0)
- 	    cmd_data->updatedb = TRUE;
- 
--	while ((ch = getopt(argc,argv,"VvuhqU:r:o:e:l:d:-:n:f:c:i")) != EOF) {
-+	while ((ch = getopt(argc,argv,"VvuhqU:r:o:e:l:d:-:n:f:c:i0")) != EOF) {
- 		switch(ch) {
- 			/* Help */
- 		 case 'h':
-@@ -823,6 +824,9 @@
- 				goto EXIT;
- 			}
- 			break;
-+		case '0':
-+			g_data->delim = '\0';
-+			break;
- 		 default:
- 			break;
- 		}
-@@ -871,4 +875,3 @@
- 
- 	return NULL;
- }
--
---- slocate-3.1/src/slocate.c
-+++ slocate-3.1/src/slocate.c
-@@ -164,6 +164,7 @@
- 	g_data->regexp_data = NULL;
- 	g_data->queries = -1;
- 	g_data->SLOCATE_GID = get_gid(g_data, DB_GROUP, &ret);
-+	g_data->delim = '\n';
- 	if (!ret)
- 	    goto EXIT;	
- 
-@@ -191,7 +192,7 @@
- 		    goto EXIT;
- 	}
- 	if (g_data->VERBOSE)
--	    fprintf(stdout, "%s\n", path);       
-+		fprintf(stdout, "%s%c", path,  g_data->delim);       
- 	/* Match number string */
- 	ptr1 = path;
- 	code_len = 0;
-@@ -471,7 +472,7 @@
- 	if (match_ret == 1) {
- 		if (g_data->queries > 0)
- 		    g_data->queries -= 1;
--		fprintf(stdout, "%s\n", full_path);
-+		fprintf(stdout, "%s%c", full_path, g_data->delim);
- 	}
- 	ret = 1;
- EXIT:
---- slocate-3.1/src/slocate.h
-+++ slocate-3.1/src/slocate.h
-@@ -81,6 +81,7 @@
- 	char **input_db;
- 	int queries;
- 	struct regexp_data_s *regexp_data;
-+	char delim;
- };
- 
- /* Encoding data */
diff --git a/sys-apps/slocate/files/slocate-3.1-build.patch b/sys-apps/slocate/files/slocate-3.1-build.patch
deleted file mode 100644
index 98f5ea113231..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/slocate.h
-+++ src/slocate.h
-@@ -35,20 +35,11 @@
- #define MTAB_FILE "/etc/mtab"
- #define UPDATEDB_FILE "/etc/updatedb.conf"
- 
--/* More fitting paths for FreeBSD -matt */
--#if defined(__FreeBSD__)
--# define DEFAULT_DB "/var/db/slocate/slocate.db"
--# define DEFAULT_DB_DIR "/var/db/slocate/"
--#elif defined(__SunOS__)
--# define DEFAULT_DB "/var/db/slocate/slocate.db"
--# define DEFAULT_DB_DIR "/var/db/slocate/"
--#else
--# define DEFAULT_DB "/var/lib/slocate/slocate.db"
--# define DEFAULT_DB_DIR "/var/lib/slocate/"
--#endif
-+#define DEFAULT_DB "/var/lib/slocate/slocate.db"
-+#define DEFAULT_DB_DIR "/var/lib/slocate/"
- 
- #define DB_UID 0
--#define DB_GROUP "slocate"
-+#define DB_GROUP "locate"
- #define DB_MODE 00640
- 
- #define SLOC_ESC -0x80
---- src/Makefile
-+++ src/Makefile
-@@ -1,16 +1,18 @@
- OBJS=slocate.o cmds.o conf.o utils.o
- HEADERS=slocate.h cmds.h conf.h utils.h
- 	
--CFLAGS=-Wall -Wshadow
--CFLAGS+=-O2
-+CFLAGS+=-Wall -Wshadow
-+#CFLAGS+=-O2
- #CFLAGS+=-g3
- #LDFLAGS+=-lefence
- 
- PROG=slocate
--CC=gcc
-+CC?=gcc
- 
--all: $(OBJS) $(MOD_OBJS)
--	$(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(MOD_OBJS)
-+all: $(PROG)
-+
-+$(PROG): $(OBJS) $(MOD_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(MOD_OBJS)
- 
- %.o: %.c $(HEADERS)
- 	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/sys-apps/slocate/files/slocate-3.1-cron.patch b/sys-apps/slocate/files/slocate-3.1-cron.patch
deleted file mode 100644
index 72c562d8a080..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-cron.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- debian/cron.daily
-+++ debian/cron.daily
-@@ -1,12 +1,11 @@
- #! /bin/sh
- 
--if [ -x /usr/bin/slocate ]
-+if [ -x /usr/bin/updatedb ]
- then
- 	if [ -f /etc/updatedb.conf ]
- 	then
--		/usr/bin/updatedb
-+		nice /usr/bin/updatedb
- 	else
--		/usr/bin/updatedb -f proc
-+		nice /usr/bin/updatedb -f proc
- 	fi
--	chown root.slocate /var/lib/slocate/slocate.db
- fi
diff --git a/sys-apps/slocate/files/slocate-3.1-cron2.patch b/sys-apps/slocate/files/slocate-3.1-cron2.patch
deleted file mode 100644
index 16be3da673da..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-cron2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- debian/cron.daily
-+++ debian/cron.daily
-@@ -1,12 +1,25 @@
- #! /bin/sh
-+
-+. /etc/init.d/functions.sh 2>/dev/null
-+on_ac_power 2>/dev/null #312583
-+[ $? -eq 1 ] && exit 0
- 
--if [ -x /usr/bin/slocate ]
-+if [ -x /usr/bin/updatedb ]
- then
- 	if [ -f /etc/updatedb.conf ]
- 	then
--		/usr/bin/updatedb
-+		. /etc/updatedb.conf
-+		args=""
- 	else
--		/usr/bin/updatedb -f proc
-+		args="-f proc"
- 	fi
--	chown root.slocate /var/lib/slocate/slocate.db
-+
-+	# run on active process in case ionice isnt installed, or
-+	# system is really old and ionice doesnt work ...
-+	ioflags=
-+	[ -n "${IONICE_CLASS}"    ] && ioflags="-c ${IONICE_CLASS}"
-+	[ -n "${IONICE_PRIORITY}" ] && ioflags="-n ${IONICE_PRIORITY}"
-+	[ -n "${ioflags}" ] && ionice ${ioflags} -p $$ 2>/dev/null
-+
-+	nice -n ${NICE:-10} /usr/bin/updatedb ${args}
- fi
diff --git a/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch b/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch
deleted file mode 100644
index 158a10a0477b..000000000000
--- a/sys-apps/slocate/files/slocate-3.1-incompat-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-slocate-2.x databases are incompat with slocate-3.x
-
---- src/slocate.c
-+++ src/slocate.c
-@@ -435,7 +435,7 @@
- 		 * cancelling the + */
- 		len = path_len+code_num;
- 		if (len <= 0) {
--			if (!report_error(g_data, FATAL, "set_path_head: path_head len <= 0: %d\n", len))
-+			if (!report_error(g_data, FATAL, "set_path_head: path_head len <= 0: %d\nPerhaps your database is still the old format and you need to run `updatedb` ?\n", len))
- 			    goto EXIT;
- 		}
- 		if (!(path_head = realloc(path_head, (sizeof(char) * (len+1))))) {
diff --git a/sys-apps/slocate/files/updatedb.conf b/sys-apps/slocate/files/updatedb.conf
deleted file mode 100644
index a6990f25cb53..000000000000
--- a/sys-apps/slocate/files/updatedb.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/updatedb.conf: config file for slocate
-# $Id: updatedb.conf,v 1.25 2008/12/02 20:09:15 vapier Exp $
-
-# This file sets variables that are used by updatedb.
-# For more info, see the updatedb(1) manpage.
-
-# Filesystems that are pruned from updatedb database
-PRUNEFS="afs auto autofs cifs devfs devpts eventpollfs futexfs gfs hugetlbfs iso9660 mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs selinuxfs sfs shfs smbfs sockfs spufs subfs supermount sysfs tmpfs udf usbfs vperfctrfs"
-
-# Paths which are pruned from updatedb database
-PRUNEPATHS="/tmp /var/tmp /root/.ccache"
-
-# nice value to run at: see -n in nice(1)
-NICE="10"
-
-# ionice class to run at: see -c in ionice(1)
-IONICE_CLASS="2"
-
-# ionice priority to run at: see -n in ionice(1)
-IONICE_PRIORITY="7"
diff --git a/sys-apps/slocate/metadata.xml b/sys-apps/slocate/metadata.xml
deleted file mode 100644
index 96a2d586367d..000000000000
--- a/sys-apps/slocate/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/slocate/slocate-2.7-r8.ebuild b/sys-apps/slocate/slocate-2.7-r8.ebuild
deleted file mode 100644
index 27b73d0a607d..000000000000
--- a/sys-apps/slocate/slocate-2.7-r8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.17 2010/10/08 02:19:11 leio Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
-HOMEPAGE="http://www.geekreview.org/slocate/"
-SRC_URI="ftp://ftp.geekreview.org/slocate/src/slocate-${PV}.tar.gz
-	mirror://gentoo/${P}-debian.patch.bz2
-	elibc_uclibc? ( mirror://gentoo/${P}-uclibc-sl_fts.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/shadow"
-RDEPEND="${DEPEND}
-	!sys-apps/rlocate"
-
-pkg_setup() {
-	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
-		eerror "The 'slocate' group has been renamed to 'locate'."
-		eerror "You seem to already have a 'slocate' group."
-		eerror "Please rename it:"
-		eerror "groupmod -n locate slocate"
-		die "Change 'slocate' to 'locate'"
-	fi
-	enewgroup locate 245
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use elibc_uclibc && epatch "${WORKDIR}"/${P}-uclibc-sl_fts.patch
-	epatch "${WORKDIR}"/${P}-debian.patch
-	epatch "${FILESDIR}"/${P}-bounds.patch
-	epatch "${FILESDIR}"/${P}-really-long-paths.patch
-
-	sed -i \
-		-e '/SLOC_GRP/s:slocate:locate:' \
-		main.c || die "sed group"
-
-	filter-lfs-flags
-
-	sed -i \
-		-e "/groupadd/s/^/#/" \
-		-e "/chown.*slocate/s/^/#/" \
-		-e '/^CFLAGS/d' \
-		-e '/man1/s:\.gz::g' \
-		Makefile.in || die
-	gunzip doc/*.gz || die
-}
-
-src_install() {
-	dodir /usr/share/man/man1
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# make install for this package is blocked by sandbox
-	dosym slocate /usr/bin/locate
-	dosym slocate /usr/bin/updatedb
-	fperms 0755 /etc/cron.daily/slocate
-	keepdir /var/lib/slocate
-
-	# #37871: nice updatedb
-	dosed 's,^\([[:space:]]*\)\(/usr/bin/updatedb\),\1nice \2,' /etc/cron.daily/slocate
-
-	dodoc AUTHORS README ChangeLog
-
-	# man page fixing
-	rm -f "${D}"/usr/share/man/man1/locate.1*
-	dosym slocate.1 /usr/share/man/man1/locate.1
-
-	insinto /etc
-	doins "${FILESDIR}/updatedb.conf"
-	fperms 0644 /etc/updatedb.conf
-
-	fowners root:locate /usr/bin/slocate
-	fperms go-r,g+s /usr/bin/slocate
-
-	chown -R root:locate "${D}/var/lib/slocate"
-	fperms 0750 /var/lib/slocate
-}
-
-pkg_postinst() {
-	touch "${ROOT}/var/lib/slocate/slocate.db"
-
-	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
-		ewarn "If you merged slocate-2.7.ebuild, please remove"
-		ewarn "/etc/cron.daily/slocate.cron since .cron has been removed"
-		ewarn "from the filename"
-		echo
-	fi
-	einfo "Note that the /etc/updatedb.conf file is generic"
-	einfo "Please customize it to your system requirements"
-}
diff --git a/sys-apps/slocate/slocate-3.1-r1.ebuild b/sys-apps/slocate/slocate-3.1-r1.ebuild
deleted file mode 100644
index 266a18474131..000000000000
--- a/sys-apps/slocate/slocate-3.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r1.ebuild,v 1.12 2008/03/16 08:41:57 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
-HOMEPAGE="http://slocate.trakker.ca/"
-SRC_URI="http://slocate.trakker.ca/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/shadow"
-RDEPEND="${DEPEND}
-	!sys-apps/rlocate"
-
-pkg_setup() {
-	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
-		eerror "The 'slocate' group has been renamed to 'locate'."
-		eerror "You seem to already have a 'slocate' group."
-		eerror "Please rename it:"
-		eerror "groupmod -n locate slocate"
-		die "Change 'slocate' to 'locate'"
-	fi
-	enewgroup locate 245
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-incompat-warning.patch
-	epatch "${FILESDIR}"/${P}-cron.patch
-}
-
-src_compile() {
-	filter-lfs-flags
-	emake -C src || die
-}
-
-src_install() {
-	dobin src/slocate || die
-	dodir /usr/bin
-	dosym slocate /usr/bin/locate
-	dosym slocate /usr/bin/updatedb
-
-	exeinto /etc/cron.daily
-	newexe debian/cron.daily slocate || die
-
-	doman doc/*.1
-	dosym slocate.1 /usr/share/man/man1/locate.1
-
-	keepdir /var/lib/slocate
-
-	dodoc Changelog README WISHLIST notes
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-
-	fowners root:locate /usr/bin/slocate
-	fperms go-r,g+s /usr/bin/slocate
-
-	chown -R root:locate "${D}"/var/lib/slocate
-	fperms 0750 /var/lib/slocate
-}
-
-pkg_preinst() {
-	if has_version '=sys-apps/slocate-2*' ; then
-		rm -f "${ROOT}"/var/lib/slocate/slocate.db
-		ewarn "The slocate database created by slocate-2.x is incompatible"
-		ewarn "with slocate-3.x.  Make sure you run updatedb!"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
-		ewarn "If you merged slocate-2.7.ebuild, please remove"
-		ewarn "/etc/cron.daily/slocate.cron since .cron has been removed"
-		ewarn "from the filename"
-		echo
-	fi
-}
diff --git a/sys-apps/slocate/slocate-3.1-r2.ebuild b/sys-apps/slocate/slocate-3.1-r2.ebuild
deleted file mode 100644
index 8c8b1e6e4381..000000000000
--- a/sys-apps/slocate/slocate-3.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-3.1-r2.ebuild,v 1.2 2009/08/15 23:47:26 vapier Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
-HOMEPAGE="http://slocate.trakker.ca/"
-SRC_URI="http://slocate.trakker.ca/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/shadow"
-RDEPEND="${DEPEND}
-	!sys-apps/rlocate"
-
-pkg_setup() {
-	if [[ -n $(egetent group slocate) ]] && [[ -z $(egetent group locate) ]] ; then
-		eerror "The 'slocate' group has been renamed to 'locate'."
-		eerror "You seem to already have a 'slocate' group."
-		eerror "Please rename it:"
-		eerror "groupmod -n locate slocate"
-		die "Change 'slocate' to 'locate'"
-	fi
-	enewgroup locate 245
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-incompat-warning.patch
-	epatch "${FILESDIR}"/${P}-CVE-2007-0227.patch
-	epatch "${FILESDIR}"/${P}-cron2.patch
-	epatch "${FILESDIR}"/${P}-NUL.patch #216838
-}
-
-src_compile() {
-	filter-lfs-flags
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	emake CC="$(tc-getCC)" -C src || die
-}
-
-src_install() {
-	dobin src/slocate || die
-	dodir /usr/bin
-	dosym slocate /usr/bin/locate
-	dosym slocate /usr/bin/updatedb
-
-	exeinto /etc/cron.daily
-	newexe debian/cron.daily slocate || die
-
-	doman doc/*.1
-	dosym slocate.1 /usr/share/man/man1/locate.1
-
-	keepdir /var/lib/slocate
-
-	dodoc Changelog README WISHLIST notes
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-
-	fowners root:locate /usr/bin/slocate
-	fperms go-r,g+s /usr/bin/slocate
-
-	chown -R root:locate "${D}"/var/lib/slocate
-	fperms 0750 /var/lib/slocate
-}
-
-pkg_preinst() {
-	if has_version '=sys-apps/slocate-2*' ; then
-		rm -f "${ROOT}"/var/lib/slocate/slocate.db
-		ewarn "The slocate database created by slocate-2.x is incompatible"
-		ewarn "with slocate-3.x.  Make sure you run updatedb!"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
-		ewarn "If you merged slocate-2.7.ebuild, please remove"
-		ewarn "/etc/cron.daily/slocate.cron since .cron has been removed"
-		ewarn "from the filename"
-		echo
-	fi
-}