ver bump to fix #65560

4 files changed, 99 insertions, 5 deletions

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index 754b10928968..f1e5095c9fb2 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/slocate
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.49 2004/08/14 08:10:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.50 2004/10/14 23:46:02 vapier Exp $
+
+*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:
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index 00b135036f5a..44e116165aee 100644
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8653fee26e4713fa709eacff37069ea9 ChangeLog 6233
+MD5 0109afa3bf115759a232ec753ee46c79 ChangeLog 6400
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e584208ed08d1bc96a781048555a6145 slocate-2.7-r5.ebuild 2562
+MD5 3b1df8b3002c0ccfd6be7ca2362917a3 slocate-2.7-r6.ebuild 2285
 MD5 186eee54e5294bbb3153df68f7d71978 files/updatedb.conf 632
 MD5 4bdd089557d4d782d79f12dff709c202 files/digest-slocate-2.7-r5 137
+MD5 4109d0757229d079e30f8ea33b676f00 files/digest-slocate-2.7-r6 211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBYNK1HTu7gpaalycRAqvkAKDfNereLloie0q1q/DiZbZyD2K6bACgk1wa
-Y4uUOCfZeAsyL0TkjXhMtw0=
-=/Jp1
+iD8DBQFBbw/HHTu7gpaalycRAhBMAJoCKyLVROOOWqrUtPogm/jByMLnCwCfUElh
+YtCOy3AWJwdoXNmn96ounQs=
+=kc5b
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/slocate/files/digest-slocate-2.7-r6 b/sys-apps/slocate/files/digest-slocate-2.7-r6
new file mode 100644
index 000000000000..18a27a0ba74b
--- /dev/null
+++ b/sys-apps/slocate/files/digest-slocate-2.7-r6
@@ -0,0 +1,3 @@
+MD5 4872830642ea2ed5f9aff932720583c9 slocate-2.7.tar.gz 87240
+MD5 464b97b8b69561dd52b136ffb12865ec slocate-2.7-debian.patch.bz2 2623
+MD5 8f236aa960216f59aaa53a70a76a6db3 slocate-2.7-uclibc-sl_fts.patch.bz2 7566
diff --git a/sys-apps/slocate/slocate-2.7-r6.ebuild b/sys-apps/slocate/slocate-2.7-r6.ebuild
new file mode 100644
index 000000000000..96e2289045b7
--- /dev/null
+++ b/sys-apps/slocate/slocate-2.7-r6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r6.ebuild,v 1.1 2004/10/14 23:46:02 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://www.geekreview.org/slocate/"
+SRC_URI="ftp://ftp.geekreview.org/slocate/src/slocate-${PV}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2
+	mirror://gentoo/${P}-uclibc-sl_fts.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="uclibc"
+
+DEPEND="sys-apps/shadow"
+RDEPEND="sys-apps/shadow"
+
+pkg_setup() {
+	enewgroup slocate
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use uclibc && epatch ${WORKDIR}/${P}-uclibc-sl_fts.patch
+	epatch ${WORKDIR}/${P}-debian.patch
+
+	append-ldflags -Wl,-z,now
+	filter-lfs-flags
+
+	sed -i \
+		-e "/groupadd/s/^/#/" \
+		-e "/chown.*slocate/s/^/#/" \
+		-e "/^CFLAGS/s:-g3:${CFLAGS}:" \
+		Makefile.in || 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.gz"
+	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
+
+	insinto /etc
+	doins "${FILESDIR}/updatedb.conf"
+	fperms 0644 /etc/updatedb.conf
+
+	fowners root:slocate /usr/bin/slocate
+	fperms go-r /usr/bin/slocate # slocate is +s
+
+	chown -R root:slocate "${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
+		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"
+		ewarn
+		echo
+	fi
+	einfo "Note that the /etc/updatedb.conf file is generic"
+	einfo "Please customize it to your system requirements"
+}