Cleanup ebuild, drop old versions

8 files changed, 15 insertions, 145 deletions

diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index 7d6fcfdec90b..7326f087ac88 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/slocate
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.16 2003/04/13 21:53:48 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.17 2003/04/17 16:34:48 lostlogic Exp $
+
+*slocate-2.7-r2 (17 Apr 2003)
+
+  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)
 
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index 7b4a3f0518b2..7ce45db7b222 100644
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,10 +1,4 @@
-MD5 804b43f343fff6c242aca86b9f14b1ff slocate-2.7-r2.ebuild 1981
-MD5 deed52f5c90674617b64da43fdb30719 slocate-2.7.ebuild 1790
-MD5 a07d4d22ec8dbd122071237efb0df890 attachment.cgi?id=10615 1806
-MD5 c70139b84478e8c4a547eb310a9c8770 slocate-2.6.ebuild 1543
-MD5 e6cca826392c445678ac9710d370a519 ChangeLog 2491
-MD5 2831adc800599b2ae5ee340beafc4e31 files/digest-slocate-2.6 62
-MD5 f03ed3063ac796dbf26187038a928db8 files/digest-slocate-2.7 62
+MD5 6c254c4e8530b0fd684f0b4217d1c165 slocate-2.7-r2.ebuild 1984
+MD5 e51d5b796ee161c0b3d9dffa4204c134 ChangeLog 2494
 MD5 cd00fa09325061c98ee3f81fefa61014 files/updatedb.conf 578
-MD5 f03ed3063ac796dbf26187038a928db8 files/digest-slocate-2.7-r1 62
 MD5 f03ed3063ac796dbf26187038a928db8 files/digest-slocate-2.7-r2 62
diff --git a/sys-apps/slocate/files/digest-slocate-2.6 b/sys-apps/slocate/files/digest-slocate-2.6
deleted file mode 100644
index dcea05d8415f..000000000000
--- a/sys-apps/slocate/files/digest-slocate-2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52fb87a7aaa68650ecf1461a9a6df781 slocate-2.6.tar.gz 69462
diff --git a/sys-apps/slocate/files/digest-slocate-2.7-r1 b/sys-apps/slocate/files/digest-slocate-2.7-r1
deleted file mode 100644
index f312912325b1..000000000000
--- a/sys-apps/slocate/files/digest-slocate-2.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4872830642ea2ed5f9aff932720583c9 slocate-2.7.tar.gz 87240
diff --git a/sys-apps/slocate/files/digest-slocate-2.7 b/sys-apps/slocate/files/digest-slocate-2.7-r2
index f312912325b1..f312912325b1 100644
--- a/sys-apps/slocate/files/digest-slocate-2.7
+++ b/sys-apps/slocate/files/digest-slocate-2.7-r2
diff --git a/sys-apps/slocate/slocate-2.6.ebuild b/sys-apps/slocate/slocate-2.6.ebuild
deleted file mode 100644
index 1ce6deb9691f..000000000000
--- a/sys-apps/slocate/slocate-2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.6.ebuild,v 1.12 2003/04/12 11:15:36 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Secure locate provides a 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips ~arm"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr || die
-	emake || die
-}
-
-
-src_install() {
-	# make install for this package is blocked by sandbox
-	dobin slocate
-	dosym /usr/bin/slocate /usr/bin/locate
-	dosym /usr/bin/slocate /usr/bin/updatedb
-
-	dodir /var/lib/slocate ; touch ${D}/var/lib/slocate/.keep
-
-	insinto /etc/cron.daily
-        doins slocate.cron
-        fperms 0755 /etc/cron.daily/slocate.cron
-
-	# man pages are already compressed for us
-	insinto /usr/share/man/man1
-	mv doc/slocate.1.linux.gz doc/slocate.1.gz
-	doins doc/slocate.1.gz doc/updatedb.1.gz
-	dosym /usr/share/man/man1/slocate.1.gz /usr/share/man/man1/locate.1.gz
-
-	dodoc LICENSE COPYING AUTHORS NEWS README ChangeLog
-}
-
-pkg_postinst() {
-	# /var/lib/slocate is owned by group slocate and so is the executable
-	groupadd slocate
-
-	chown root.slocate /usr/bin/slocate
-	chmod 2755 /usr/bin/slocate
-
-	chown root.slocate /var/lib/slocate
-	chmod 0750 /var/lib/slocate
-}
diff --git a/sys-apps/slocate/slocate-2.7-r1.ebuild b/sys-apps/slocate/slocate-2.7-r2.ebuild
index 3e0d59e78b05..2ed6ece779a9 100644
--- a/sys-apps/slocate/slocate-2.7-r1.ebuild
+++ b/sys-apps/slocate/slocate-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r1.ebuild,v 1.6 2003/04/13 21:53:48 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r2.ebuild,v 1.1 2003/04/17 16:34:48 lostlogic Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure locate provides a secure way to index and quickly search for files on your system (drop-in replacement for 'locate')"
@@ -17,43 +17,31 @@ src_install() {
 
 	dodir /usr/share/man/man1
 
-	sed -i -e "/groupadd/s/^/#/;/chown.*slocate/s/^/#/" Makefile
+	sed -i -e "/groupadd/s/^/#/;/chown.*slocate/s/^/#/" Makefile || die
 	make DESTDIR=${D} install || die
 
 	# make install for this package is blocked by sandbox
-#	dobin slocate
 	dosym slocate /usr/bin/locate
 	dosym slocate /usr/bin/updatedb
 	fperms 0755 /etc/cron.daily/slocate
-#
-#	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
-#
 	keepdir /var/lib/slocate
 
-
 	# If this file doesn't exist, the first run of updatedb will create
 	# it anyway.  But doing this shuts it up.
-	if [ ! -f ${ROOT}/var/lib/slocate/slocate.db ]
-	then
+	if [ ! -f ${ROOT}/var/lib/slocate/slocate.db ] ; then
 		touch ${D}/var/lib/slocate/slocate.db
 	fi
 
 	dodoc INSTALL LICENSE COPYING AUTHORS NEWS README ChangeLog
 
-
 	# man page fixing
 	rm -rf ${D}/usr/share/man/man1/locate.1.gz
 	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
 
 
-	# Make a fake updatedb.conf file, to shut slocate up 
-	echo "# There is a sample config file in :" > updatedb.conf
-	echo "# /usr/share/doc/${PF}/updatedb.conf.gz" >> updatedb.conf
 	insinto /etc
-	doins updatedb.conf
+	doins ${FILESDIR}/updatedb.conf
 	fperms 0644 /etc/updatedb.conf
-
-	dodoc ${FILESDIR}/updatedb.conf
 }
 
 pkg_postinst() {
@@ -72,7 +60,6 @@ pkg_postinst() {
 	ewarn "/etc/cron.daily/slocate.cron the .cron is no longer"
 	ewarn "in the filename"
 	echo
-	einfo "Please note that the /etc/updatedb.conf file is EMPTY"
-	einfo "There is a sample configuration file in"
-	einfo "/usr/share/doc/${PF}"
+	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-2.7.ebuild b/sys-apps/slocate/slocate-2.7.ebuild
deleted file mode 100644
index f3b7a0773a57..000000000000
--- a/sys-apps/slocate/slocate-2.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7.ebuild,v 1.6 2003/04/12 16:22:11 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Secure locate provides a 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips"
-
-DEPEND="virtual/glibc"
-
-src_install() {
-
-	dodir /usr/share/man/man1
-
-	make DESTDIR=${D} install || die
-
-	# make install for this package is blocked by sandbox
-#	dobin slocate
-	dosym slocate /usr/bin/locate
-	dosym slocate /usr/bin/updatedb
-	fperms 0755 /etc/cron.daily/slocate.cron
-#
-#	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
-#
-	dodir /var/lib/slocate ; touch ${D}/var/lib/slocate/.keep
-
-	touch ${D}/etc/updatedb.conf
-
-	dodoc INSTALL LICENSE COPYING AUTHORS NEWS README ChangeLog
-
-
-	# man page fixing
-	rm -rf ${D}/usr/share/man/man1/locate.1.gz
-	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
-
-	echo "# There is a sample config file in :" > updatedb.conf
-	echo "# /usr/share/doc/${P}/updatedb.conf.gz" >> updatedb.conf
-	insinto /etc
-	doins updatedb.conf
-	fperms 0644 /etc/updatedb.conf
-
-	dodoc ${FILESDIR}/updatedb.conf
-}
-
-pkg_postinst() {
-	# /var/lib/slocate is owned by group slocate and so is the executable
-	groupadd slocate
-
-	chown root.slocate /usr/bin/slocate
-	chmod 2755 /usr/bin/slocate
-
-	chown root.slocate /var/lib/slocate
-	chmod 0750 /var/lib/slocate
-
-	einfo "Please note that the /etc/updatedb.conf file is EMPTY"
-	einfo "There is a sample configuration file in"
-	einfo "/usr/share/doc/${P}"
-}